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$/Makefile" afterPath="$PROJECT_DIR$/Makefile" />
-      <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$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
-      <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" />
     </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,9 +1,10 @@
 <project default="all">
     <property environment="env"/>
-	<property name="root-folder" value="${basedir}/../../"/>
+    <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"/>
 
@@ -13,7 +14,7 @@
         </classpath>
     </typedef>
 
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
         <classpath>
             <pathelement location="${tools-folder}/lib/ant-contrib-1.0b3.jar"/>
         </classpath>
@@ -53,7 +54,8 @@
             <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+">
+                <zConcat outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-debugfile}"
+                         prioritize="\w+">
                     <concatfiles>
                         <fileset dir="js" includes="**/*.js"/>
                     </concatfiles>
@@ -67,7 +69,8 @@
             <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}">
+                <zConcat outputFolder="${target-folder}/${plugin-folder}/${plugin-css-folder}"
+                         outputFile="${plugin-css-file}">
                     <concatfiles>
                         <fileset dir="${plugin-css-folder}" includes="**/*.css"/>
                     </concatfiles>
@@ -97,7 +100,8 @@
             <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}">
+                <zCompile inputFolder="${target-folder}/${plugin-folder}/js" inputFile="${plugin-debugfile}"
+                          outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-file}">
                     <externs>
                         var Ext = {};
                         var Zarafa = {};
@@ -157,8 +161,50 @@
         </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">
+    <target name="deploy" depends="compress, validate, language">
         <mkdir dir="${target-folder}/${plugin-folder}"/>
 
         <!-- Copy (and validate) manifest.xml -->