Updated build scripts

.idea/workspace.xml

@@ -2,17 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aae153d8-808f-4371-b0e9-9ee7ff904cab" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/js/dialogs/fields.txt" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo" afterPath="$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/ABOUT.js" afterPath="$PROJECT_DIR$/js/ABOUT.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/data/ResponseHandler.js" afterPath="$PROJECT_DIR$/js/data/ResponseHandler.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" afterPath="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/dialogs/ImportPanel.js" afterPath="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/plugin.contactimporter.js" afterPath="$PROJECT_DIR$/js/plugin.contactimporter.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/ui/ContextMenu.js" afterPath="$PROJECT_DIR$/js/ui/ContextMenu.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po" afterPath="$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/upload.php" afterPath="$PROJECT_DIR$/php/upload.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Makefile" afterPath="$PROJECT_DIR$/Makefile" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
     </list>
     <ignored path="contactimporter.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -100,7 +91,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="plugin_calendarimporter.po" pinned="false" current-in-tab="true">
+      <file leaf-file-name="plugin_calendarimporter.po" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="0">
@@ -110,6 +101,26 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="build.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/build.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="165">
+              <caret line="167" column="18" selection-start-line="167" selection-start-column="18" selection-end-line="167" selection-end-column="18" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="manifest.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/manifest.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="ImportContentPanel.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/dialogs/ImportContentPanel.js">
           <provider selected="true" editor-type-id="text-editor">
@@ -141,6 +152,7 @@
         <option value="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
         <option value="$PROJECT_DIR$/js/data/ResponseHandler.js" />
         <option value="$PROJECT_DIR$/php/upload.php" />
+        <option value="$PROJECT_DIR$/build.xml" />
       </list>
     </option>
   </component>
@@ -410,18 +422,18 @@
       <updated>1480428196914</updated>
       <workItem from="1480428199144" duration="44000" />
       <workItem from="1480428259775" duration="69000" />
-      <workItem from="1480428330068" duration="2756000" />
+      <workItem from="1480428330068" duration="5601000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2869000" />
+    <option name="totallyTimeSpent" value="5714000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="65" y="24" width="1792" height="999" extended-state="6" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -590,6 +602,22 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/manifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="167" column="18" selection-start-line="167" selection-start-column="18" selection-end-line="167" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

Makefile

@@ -1,2 +1,2 @@
 default:
-	ant deploy; cp -r /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/contactimporter /usr/share/kopano-webapp/plugins/
+	rm -rf /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/contactimporter; ant deploy; cp -r /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/contactimporter /usr/share/kopano-webapp/plugins/

build.xml

@@ -1,200 +1,246 @@
 <project default="all">
-	<property environment="env"/>
-	<property name="root-folder" value="${basedir}/../../"/>
-	<property name="tools-folder" value="${root-folder}/tools/"/>
-	<property name="target-folder" value="${root-folder}/deploy/plugins"/>
-	<property name="server-folder" value="${root-folder}/server"/>
-
-	<import file="${tools-folder}/antutil.xml"/>
-
-	<typedef file="${tools-folder}/antlib.xml">
-		<classpath>
-			<pathelement location="${tools-folder}/tools.jar"/>
-		</classpath>
-	</typedef>
-
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
-		<classpath>
-			<pathelement location="${tools-folder}/lib/ant-contrib-1.0b3.jar"/>
-		</classpath>
-	</taskdef>
-
-	<!-- Determine plugin name -->
-	<basename file="${basedir}" property="plugin"/>
-
-	<!-- The Plugin distribution files -->
-	<property name="plugin-folder" value="${plugin}"/>
-	<property name="plugin-debugfile" value="${plugin}-debug.js"/>
-	<property name="plugin-file" value="${plugin}.js"/>
-
-	<!-- The Plugin CSS files -->
-	<property name="plugin-css-folder" value="resources/css"/>
-	<property name="plugin-css-file" value="${plugin}.css"/>
-
-	<!-- Meta target -->
-	<target name="all" depends="concat, compress"/>
-
-	<!-- Clean -->
-	<target name="clean">
-		<delete includeemptydirs="true" failonerror="false">
-			<!-- Delete the Plugin files -->
-			<fileset dir="${target-folder}/${plugin-folder}/js">
-				<include name="${plugin-file}"/>
-				<include name="${plugin-debugfile}"/>
-			</fileset>
-		</delete>
-	</target>
-
-	<!-- Concatenates JavaScript files with automatic dependency generation -->
-	<target name="concat">
-		<!-- Concatenate plugin JS file -->
-		<if>
-			<available file="js" type="dir" />
-			<then>
-				<mkdir dir="${target-folder}/${plugin-folder}/js"/>
-				<echo message="Concatenating: ${plugin-debugfile}"/>
-				<zConcat outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-debugfile}" prioritize="\w+">
-					<concatfiles>
-						<fileset dir="js" includes="**/*.js" />
-					</concatfiles>
-				</zConcat>
-			</then>
-		</if>
-
-		<!-- Concatenate plugin CSS files -->
-		<if>
-			<available file="${plugin-css-folder}" type="dir" />
-			<then>
-				<mkdir dir="${target-folder}/${plugin-folder}/${plugin-css-folder}"/>
-				<echo message="Concatenating: ${plugin-css-file}"/>
-				<zConcat outputFolder="${target-folder}/${plugin-folder}/${plugin-css-folder}" outputFile="${plugin-css-file}">
-					<concatfiles>
-						<fileset dir="${plugin-css-folder}" includes="**/*.css" />
-					</concatfiles>
-				</zConcat>
-			</then>
-		</if>
-	</target>
-
-	<!-- Preformat the Concatenated Javascript files to improve compilation -->
-	<target name="preformat" depends="concat">
-		<if>
-			<available file="${target-folder}/${plugin-folder}/js/${plugin-debugfile}" type="file" />
-			<then>
-				<echo message="Preformatting: ${plugin-debugfile}"/>
-				<replaceregexp byline="true">
-					<regexp pattern="(^[ ,\t]*\*[ ,\t]@.*)\{(.*)\[\]\}"/>
-					<substitution expression="\1{\2\|Array}"/>
-					<fileset dir="${target-folder}/${plugin-folder}/js" includes="${plugin-debugfile}"/>
-				</replaceregexp>
-			</then>
-		</if>
-	</target>
-
-	<!-- Compress JavaScript -->
-	<target name="compress" depends="preformat">
-		<if>
-			<available file="${target-folder}/${plugin-folder}/js/${plugin-debugfile}" type="file" />
-			<then>
-				<echo message="Compiling: ${plugin-debugfile}" />
-				<zCompile inputFolder="${target-folder}/${plugin-folder}/js" inputFile="${plugin-debugfile}" outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-file}">
-					<externs>
-						var Ext = {};
-						var Zarafa = {};
-						var container = {};
-						var _ = function(key, domain) {};
-						var dgettext = function(domain, msgid) {};
-						var dngettext = function(domain, msgid, msgid_plural, count) {};
-						var dnpgettext = function(domain, msgctxt, msgid, msgid_plural, count) {};
-						var dpgettext = function(domain, msgctxt, msgid) {};
-						var ngettext = function(msgid, msgid_plural, count) {};
-						var npgettext = function(msgctxt, msgid, msgid_plural, count) {};
-						var pgettext = function(msgctxt, msgid) {};
-					</externs>
-				</zCompile>
-			</then>
-		</if>
-	</target>
-
-	<!-- syntax check all PHP files -->
-	<target name="validate">
-		<if>
-			<available file="php" filepath="${env.PATH}" />
-			<then>
-				<if>
-					<available file="config.php" type="file" />
-					<then>
-						<antcall target="syntax-check">
-							<param name="file" value="config.php"/>
-						</antcall>
-					</then>
-				</if>
-				<if>
-					<available file="php" type="dir" />
-					<then>
-						<foreach target="syntax-check" param="file">
-							<path>
-								<fileset dir=".">
-									<exclude name="php/vendor/**" />
-									<include name="**/*.php"/>
-								</fileset>
-							</path>
-						</foreach>
-					</then>
-				</if>
-			</then>
-			<else>
-				<echo message="WARNING: PHP not available, not performing syntax-check on php files"/>
-			</else>
-		</if>
-	</target>
-
-	<target name="syntax-check">
-		<echo message="validating ${file}"/>
-		<exec executable="php" failonerror="true">
-			<arg value="-l"/>
-			<arg value="${file}"/>
-		</exec>
-	</target>
-
-	<!-- Install all files into the target folder -->
-	<target name="deploy" depends="compress, validate">
-		<mkdir dir="${target-folder}/${plugin-folder}"/>
-
-		<!-- Copy (and validate) manifest.xml -->
-		<if>
-			<available file="xmllint" filepath="${env.PATH}" />
-			<then>
-				<exec executable="xmllint" output="${target-folder}/${plugin-folder}/manifest.xml" failonerror="true">
-					<arg value="--valid"/>
-					<arg value="--path"/>
-					<arg value="${server-folder}"/>
-					<arg value="manifest.xml"/>
-				</exec>
-			</then>
-			<else>
-				<echo message="WARNING: xmllint not available, not performing syntax-check on manifest.xml"/>
-				<!-- xmllint is not available, so we must copy the file manually -->
-				<copy todir="${target-folder}/${plugin-folder}">
-					<fileset dir=".">
-						<include name="manifest.xml"/>
-					</fileset>
-				</copy>
-			</else>
-		</if>
-
-		<!-- copy files -->
-		<copy todir="${target-folder}/${plugin-folder}">
-			<fileset dir=".">
-				<include name="resources/**/*.*"/>
-				<include name="external/**/*.*"/>
-				<include name="php/**/*.php"/>
-				<include name="config.php"/>
-				<!-- exclude the ant script -->
-				<exclude name="build.xml"/>
-				<!-- CSS is generated during build -->
-				<exclude name="resources/css/*.*"/>
-			</fileset>
-		</copy>
-	</target>
+    <property environment="env"/>
+    <property name="root-folder" value="${basedir}/../.."/>
+    <property name="tools-folder" value="${root-folder}/tools/"/>
+    <property name="target-folder" value="${root-folder}/deploy/plugins"/>
+    <property name="server-folder" value="${root-folder}/server"/>
+    <property name="language-folder" value="${basedir}/languages"/>
+
+    <import file="${tools-folder}/antutil.xml"/>
+
+    <typedef file="${tools-folder}/antlib.xml">
+        <classpath>
+            <pathelement location="${tools-folder}/tools.jar"/>
+        </classpath>
+    </typedef>
+
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+        <classpath>
+            <pathelement location="${tools-folder}/lib/ant-contrib-1.0b3.jar"/>
+        </classpath>
+    </taskdef>
+
+    <!-- Determine plugin name -->
+    <basename file="${basedir}" property="plugin"/>
+
+    <!-- The Plugin distribution files -->
+    <property name="plugin-folder" value="${plugin}"/>
+    <property name="plugin-debugfile" value="${plugin}-debug.js"/>
+    <property name="plugin-file" value="${plugin}.js"/>
+
+    <!-- The Plugin CSS files -->
+    <property name="plugin-css-folder" value="resources/css"/>
+    <property name="plugin-css-file" value="${plugin}.css"/>
+
+    <!-- Meta target -->
+    <target name="all" depends="concat, compress"/>
+
+    <!-- Clean -->
+    <target name="clean">
+        <delete includeemptydirs="true" failonerror="false">
+            <!-- Delete the Plugin files -->
+            <fileset dir="${target-folder}/${plugin-folder}/js">
+                <include name="${plugin-file}"/>
+                <include name="${plugin-debugfile}"/>
+            </fileset>
+        </delete>
+    </target>
+
+    <!-- Concatenates JavaScript files with automatic dependency generation -->
+    <target name="concat">
+        <!-- Concatenate plugin JS file -->
+        <if>
+            <available file="js" type="dir"/>
+            <then>
+                <mkdir dir="${target-folder}/${plugin-folder}/js"/>
+                <echo message="Concatenating: ${plugin-debugfile}"/>
+                <zConcat outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-debugfile}"
+                         prioritize="\w+">
+                    <concatfiles>
+                        <fileset dir="js" includes="**/*.js"/>
+                    </concatfiles>
+                </zConcat>
+            </then>
+        </if>
+
+        <!-- Concatenate plugin CSS files -->
+        <if>
+            <available file="${plugin-css-folder}" type="dir"/>
+            <then>
+                <mkdir dir="${target-folder}/${plugin-folder}/${plugin-css-folder}"/>
+                <echo message="Concatenating: ${plugin-css-file}"/>
+                <zConcat outputFolder="${target-folder}/${plugin-folder}/${plugin-css-folder}"
+                         outputFile="${plugin-css-file}">
+                    <concatfiles>
+                        <fileset dir="${plugin-css-folder}" includes="**/*.css"/>
+                    </concatfiles>
+                </zConcat>
+            </then>
+        </if>
+    </target>
+
+    <!-- Preformat the Concatenated Javascript files to improve compilation -->
+    <target name="preformat" depends="concat">
+        <if>
+            <available file="${target-folder}/${plugin-folder}/js/${plugin-debugfile}" type="file"/>
+            <then>
+                <echo message="Preformatting: ${plugin-debugfile}"/>
+                <replaceregexp byline="true">
+                    <regexp pattern="(^[ ,\t]*\*[ ,\t]@.*)\{(.*)\[\]\}"/>
+                    <substitution expression="\1{\2\|Array}"/>
+                    <fileset dir="${target-folder}/${plugin-folder}/js" includes="${plugin-debugfile}"/>
+                </replaceregexp>
+            </then>
+        </if>
+    </target>
+
+    <!-- Compress JavaScript -->
+    <target name="compress" depends="preformat">
+        <if>
+            <available file="${target-folder}/${plugin-folder}/js/${plugin-debugfile}" type="file"/>
+            <then>
+                <echo message="Compiling: ${plugin-debugfile}"/>
+                <zCompile inputFolder="${target-folder}/${plugin-folder}/js" inputFile="${plugin-debugfile}"
+                          outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-file}">
+                    <externs>
+                        var Ext = {};
+                        var Zarafa = {};
+                        var container = {};
+                        var _ = function(key, domain) {};
+                        var dgettext = function(domain, msgid) {};
+                        var dngettext = function(domain, msgid, msgid_plural, count) {};
+                        var dnpgettext = function(domain, msgctxt, msgid, msgid_plural, count) {};
+                        var dpgettext = function(domain, msgctxt, msgid) {};
+                        var ngettext = function(msgid, msgid_plural, count) {};
+                        var npgettext = function(msgctxt, msgid, msgid_plural, count) {};
+                        var pgettext = function(msgctxt, msgid) {};
+                    </externs>
+                </zCompile>
+            </then>
+        </if>
+    </target>
+
+    <!-- syntax check all PHP files -->
+    <target name="validate">
+        <if>
+            <available file="php" filepath="${env.PATH}"/>
+            <then>
+                <if>
+                    <available file="config.php" type="file"/>
+                    <then>
+                        <antcall target="syntax-check">
+                            <param name="file" value="config.php"/>
+                        </antcall>
+                    </then>
+                </if>
+                <if>
+                    <available file="php" type="dir"/>
+                    <then>
+                        <foreach target="syntax-check" param="file">
+                            <path>
+                                <fileset dir=".">
+                                    <exclude name="php/vendor/**"/>
+                                    <include name="**/*.php"/>
+                                </fileset>
+                            </path>
+                        </foreach>
+                    </then>
+                </if>
+            </then>
+            <else>
+                <echo message="WARNING: PHP not available, not performing syntax-check on php files"/>
+            </else>
+        </if>
+    </target>
+
+    <target name="syntax-check">
+        <echo message="validating ${file}"/>
+        <exec executable="php" failonerror="true">
+            <arg value="-l"/>
+            <arg value="${file}"/>
+        </exec>
+    </target>
+
+    <!-- Generate language files -->
+    <target name="language">
+        <if>
+            <available file="msgfmt" filepath="${env.PATH}" />
+            <then>
+                <for param="file" parallel="true">
+                    <fileset dir="${language-folder}">
+                        <include name="**/LC_MESSAGES/*.po"/>
+                    </fileset>
+                    <sequential>
+                        <antcall target="msgfmt">
+                            <param name="file" value="@{file}"/>
+                        </antcall>
+                    </sequential>
+                </for>
+            </then>
+            <else>
+                <echo message="WARNING: msgfmt not available, not generating *.mo files for translations"/>
+                <!-- just copy files -->
+                <copy todir="${target-folder}/${plugin-folder}">
+                    <fileset dir=".">
+                        <include name="languages/**/*.mo"/>
+                        <include name="languages/**/*.txt"/>
+                    </fileset>
+                </copy>
+            </else>
+        </if>
+    </target>
+
+    <target name="msgfmt">
+        <propertyregex property="outfile" input="${file}" regexp=".*\/(languages\/.*)\.po" replace="${target-folder}/${plugin-folder}/\1\.mo"/>
+        <echo message="Converting ${file} to ${outfile}"/>
+        <dirname property="outdir" file="${outfile}"/>
+        <mkdir dir="${outdir}"/>
+        <exec executable="msgfmt" failonerror="true">
+            <arg value="-v"/>
+            <arg value="-o"/>
+            <arg value="${outfile}"/>
+            <arg value="${file}"/>
+        </exec>
+    </target>
+
+    <!-- Install all files into the target folder -->
+    <target name="deploy" depends="compress, validate, language">
+        <mkdir dir="${target-folder}/${plugin-folder}"/>
+
+        <!-- Copy (and validate) manifest.xml -->
+        <if>
+            <available file="xmllint" filepath="${env.PATH}"/>
+            <then>
+                <exec executable="xmllint" output="${target-folder}/${plugin-folder}/manifest.xml" failonerror="true">
+                    <arg value="--valid"/>
+                    <arg value="--path"/>
+                    <arg value="${server-folder}"/>
+                    <arg value="manifest.xml"/>
+                </exec>
+            </then>
+            <else>
+                <echo message="WARNING: xmllint not available, not performing syntax-check on manifest.xml"/>
+                <!-- xmllint is not available, so we must copy the file manually -->
+                <copy todir="${target-folder}/${plugin-folder}">
+                    <fileset dir=".">
+                        <include name="manifest.xml"/>
+                    </fileset>
+                </copy>
+            </else>
+        </if>
+
+        <!-- copy files -->
+        <copy todir="${target-folder}/${plugin-folder}">
+            <fileset dir=".">
+                <include name="resources/**/*.*"/>
+                <include name="external/**/*.*"/>
+                <include name="php/**/*.php"/>
+                <include name="config.php"/>
+                <!-- exclude the ant script -->
+                <exclude name="build.xml"/>
+                <!-- CSS is generated during build -->
+                <exclude name="resources/css/*.*"/>
+            </fileset>
+        </copy>
+    </target>
 </project>