From 354ad3d1e12dae4a9bd69b497a4506be21f2c575 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Thu, 10 Jun 2010 16:05:37 -0400
Subject: [PATCH] - renamed config.xml to config.xml.dev. The config.xml is
changed by each developer and sometimes gets checked-in which is a little
annoying. Developers must now copy config.xml.dev to config.xml. The
config.xml is added to .gitignore so it doesn't get checked-in.
---
bigbluebutton-client/README | 4 +++
bigbluebutton-client/build.xml | 28 ++++++++++++++++---
bigbluebutton-client/copyright.txt | 17 -----------
bigbluebutton-client/src/conf/.gitignore | 1 +
.../src/conf/{config.xml => config.xml.dev} | 0
.../src/conf/config.xml.template | 0
bigbluebutton-client/src/conf/locales.xml | 0
7 files changed, 29 insertions(+), 21 deletions(-)
create mode 100644 bigbluebutton-client/README
delete mode 100644 bigbluebutton-client/copyright.txt
create mode 100644 bigbluebutton-client/src/conf/.gitignore
rename bigbluebutton-client/src/conf/{config.xml => config.xml.dev} (100%)
mode change 100755 => 100644
mode change 100755 => 100644 bigbluebutton-client/src/conf/config.xml.template
mode change 100755 => 100644 bigbluebutton-client/src/conf/locales.xml
diff --git a/bigbluebutton-client/README b/bigbluebutton-client/README
new file mode 100644
index 0000000000..6822178493
--- /dev/null
+++ b/bigbluebutton-client/README
@@ -0,0 +1,4 @@
+see http://code.google.com/p/bigbluebutton
+
+Developing the client
+1. Copy src/conf/config.xml.dev to src/cong/config.xml
diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index f05069d6be..c19e20a2ff 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -23,8 +23,11 @@
<property name="VIDEO" value="VideoconfModule" />
<property name="HIGHLIGHTER" value="HighlighterModule" />
<property name="DYN_INFO" value="DynamicInfoModule" />
-
+
+ <property name="AVAILABLE_LOCALES" value="az_AZ,de_DE,el_GR,en_US,es_ES,es_LA,fr_FR,hu_HU,it_IT,lt_LT,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,tr_TR,vi_VN,zh_CN,zh_TW"/>
+
<xmlproperty file="${SRC_DIR}/conf/locales.xml" collapseAttributes="true"/>
+
<target name="init-ant-contrib">
<property name="ant-contrib.jar" location="${BASE_DIR}/build/lib/ant-contrib-0.6.jar"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>
@@ -32,8 +35,9 @@
<target name="localization" depends="init-ant-contrib">
<echo message="Parsing ${SRC_DIR}/conf/locales.xml for supported locales"/>
- <echo message="Supported locales ${locales.locale.code}"/>
- <foreach list="${locales.locale.code}" target="build-locale" param="supportedlocale" delimiter=","/>
+ <echo message="Available locales ${AVAILABLE_LOCALES}"/>
+ <!--foreach list="${locales.locale.code}" target="build-locale" param="supportedlocale" delimiter=","/-->
+ <foreach list="${AVAILABLE_LOCALES}" target="build-locale" param="supportedlocale" delimiter=","/>
</target>
<target name="build-locale">
@@ -54,10 +58,26 @@
</if>
<compileLocale locale="${supportedlocale}" />
</target>
-
+
<macrodef name="compileLocale" description="Compiles the Resource package for the given locale">
<attribute name="locale" default="en_US"/>
<sequential>
+ <echo message="Building @{locale}"/>
+ <available file="${LOCALE_DIR}/@{locale}" type="dir" property="locale.dir.present"/>
+ <if>
+ <equals arg1="${locale.dir.present}" arg2="true"/>
+ <then>
+ <echo message="No need to copy ${LOCALE_DIR}/@{locale}"/>
+ </then>
+ <else>
+ <echo message="Need to copy ${LOCALE_DIR}/@{locale}"/>
+ <exec dir="${BASE_DIR}" vmlauncher="true" executable="copylocale">
+ <arg value="en_US"/>
+ <arg value="@{locale}"/>
+ </exec>
+ </else>
+ </if>
+
<!--
Create the Flex Home directory for the language in question.
This is necessary to compensate for a bug in pre-3.2 releases of
diff --git a/bigbluebutton-client/copyright.txt b/bigbluebutton-client/copyright.txt
deleted file mode 100644
index c1f56c138c..0000000000
--- a/bigbluebutton-client/copyright.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Copyright 2006-2010 by respective authors (see below). All rights reserved.
-
-This library is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2.1 of the License, or (at your option) any later
-version.
-
-This library is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this library; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-The Blindside Project
diff --git a/bigbluebutton-client/src/conf/.gitignore b/bigbluebutton-client/src/conf/.gitignore
new file mode 100644
index 0000000000..7e90cf1085
--- /dev/null
+++ b/bigbluebutton-client/src/conf/.gitignore
@@ -0,0 +1 @@
+config.xml
diff --git a/bigbluebutton-client/src/conf/config.xml b/bigbluebutton-client/src/conf/config.xml.dev
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-client/src/conf/config.xml
rename to bigbluebutton-client/src/conf/config.xml.dev
diff --git a/bigbluebutton-client/src/conf/config.xml.template b/bigbluebutton-client/src/conf/config.xml.template
old mode 100755
new mode 100644
diff --git a/bigbluebutton-client/src/conf/locales.xml b/bigbluebutton-client/src/conf/locales.xml
old mode 100755
new mode 100644
--
GitLab