directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r547214 - /directory/studio/trunk/build.xml
Date Thu, 14 Jun 2007 10:56:34 GMT
Author: pamarcelot
Date: Thu Jun 14 03:56:33 2007
New Revision: 547214

URL: http://svn.apache.org/viewvc?view=rev&rev=547214
Log:
Updated the root build script with the new build system.

Modified:
    directory/studio/trunk/build.xml

Modified: directory/studio/trunk/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/build.xml?view=diff&rev=547214&r1=547213&r2=547214
==============================================================================
--- directory/studio/trunk/build.xml (original)
+++ directory/studio/trunk/build.xml Thu Jun 14 03:56:33 2007
@@ -16,12 +16,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="studio-complete" default="bundle">
-    <property name="project.name" value="studio-complete" />
-    <property name="project.version" value="1.0.0" />
-    <property name="studio-complete.output" value="${basedir}/target" />
-    <property name="studio-complete.build" value="${studio-complete.output}/ApacheDirectoryStudio"
/>
-    <property name="studio-complete.userguides" value="${studio-complete.output}/userguides"
/>
+<project default="bundle">
+    <property name="target" value="${basedir}/target" />
+    <property name="target.build" value="${target}/ApacheDirectoryStudio" />
+    <property name="target.userguides" value="${target}/userguides" />
     
     <!-- Setting up OS Name-->
     <condition property="studio-rcp.os.name" value="macosx" >
@@ -50,43 +48,39 @@
             <equals arg1="${studio-rcp.os.name}" arg2="macosx"/>
     </condition>
 
-    <!-- ================================== -->
-    <!--                HELP                -->
-    <!-- ================================== -->
+    <!-- HELP TASK -->
     <target name="help" description="Shows help">
         <echo>Available commands:</echo>
-	<echo>  bundle - Generate and bundles a complete version of Apache Directory Studio</echo>
-	<echo>      When bundling you can specify the target operating system using this option:</echo>
-	<echo>          o -Dstudio-rcp.os.name=macosx for Mac OS X</echo>
-	<echo>          o -Dstudio-rcp.os.name=linux for Linux</echo>
-	<echo>          o -Dstudio-rcp.os.name=win32 for Windows</echo>
-	<echo>      and the target architecture using this option:</echo>
-	<echo>          o -Dstudio-rcp.os.arch=i386 for i386 architecture (Linux and Mac OS
X)</echo>
-	<echo>          o -Dstudio-rcp.os.arch=x86 for x86 architecture (Windows only)</echo>
-	<echo>          o -Dstudio-rcp.os.arch=ppc for PowerPC architecture</echo>
+		<echo>  bundle - Generate and bundles a complete version of Apache Directory Studio</echo>
+		<echo>      When bundling you can specify the target operating system using this
option:</echo>
+		<echo>          o -Dstudio-rcp.os.name=macosx for Mac OS X</echo>
+		<echo>          o -Dstudio-rcp.os.name=linux for Linux</echo>
+		<echo>          o -Dstudio-rcp.os.name=win32 for Windows</echo>
+		<echo>      and the target architecture using this option:</echo>
+		<echo>          o -Dstudio-rcp.os.arch=i386 for i386 architecture (Linux and Mac
OS X)</echo>
+		<echo>          o -Dstudio-rcp.os.arch=x86 for x86 architecture (Windows only)</echo>
+		<echo>          o -Dstudio-rcp.os.arch=ppc for PowerPC architecture</echo>
         <echo>  clean - Delete any generated file (javadoc, classes, jars, distribution)</echo>
         <echo>  javadoc - Generate Javadoc files</echo>
         <echo>  userguides - Generate HTML and PDF user guides</echo>
-	<echo>  resolve - Resolves the library dependencies using Ivy</echo>
+		<echo>  resolve - Resolves the library dependencies using Ivy</echo>
     </target>
 
-    <!-- ================================== -->
-    <!--               BUNDLE               -->
-    <!-- ================================== -->
+    <!-- BUNDLE TASK -->
     <target name="bundle" description="Bundles the complete application">
-        <condition property="application.plugins" value="${studio-complete.build}/Apache
Directory Studio.app/Contents/Resources/Java/plugins" >
+        <condition property="application.plugins" value="${target.build}/Apache Directory
Studio.app/Contents/Resources/Java/plugins" >
             <equals arg1="${studio-rcp.os.name}" arg2="macosx"/>
         </condition>
-        <condition property="application.plugins" value="${studio-complete.build}/plugins"
>
+        <condition property="application.plugins" value="${target.build}/plugins" >
             <or>
                 <equals arg1="${studio-rcp.os.name}" arg2="linux"/>
                 <equals arg1="${studio-rcp.os.name}" arg2="win32"/>
             </or>
         </condition>
-        <condition property="application.features" value="${studio-complete.build}/Apache
Directory Studio.app/Contents/Resources/Java/features" >
+        <condition property="application.features" value="${target.build}/Apache Directory
Studio.app/Contents/Resources/Java/features" >
             <equals arg1="${studio-rcp.os.name}" arg2="macosx"/>
         </condition>
-        <condition property="application.features" value="${studio-complete.build}/features"
>
+        <condition property="application.features" value="${target.build}/features" >
             <or>
                 <equals arg1="${studio-rcp.os.name}" arg2="linux"/>
                 <equals arg1="${studio-rcp.os.name}" arg2="win32"/>
@@ -94,13 +88,13 @@
         </condition>
     
 	    <!-- Creation of the build folder -->
-        <mkdir dir="${studio-complete.build}" />
+        <mkdir dir="${target.build}" />
 
         <!-- Creation of the Apache Directory Studio RCP application -->
         <ant dir="studio-rcp" inheritAll="no" />
         <!-- Copy of the RCP app -->
-        <copy todir="${studio-complete.build}">
-            <fileset dir="${basedir}/studio-rcp/target/ApacheDirectoryStudio">
+        <copy todir="${target.build}">
+            <fileset dir="studio-rcp/target/ApacheDirectoryStudio">
                 <include name="**" />
             </fileset>
         </copy>
@@ -109,7 +103,7 @@
         <ant dir="studio-rcp-help" inheritAll="no" />
         <!-- Copy of the Apache Directory Studio RCP Help Plugin in the "plugins" folder
of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-rcp-help/target/">
+            <fileset dir="studio-rcp-help/target/">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -118,7 +112,7 @@
         <ant dir="studio-schemaeditor-plugin" inheritAll="no" />
         <!-- Copy of the Schemas Editor Plugin in the "plugins" folder of the RCP app
-->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-schemaeditor-plugin/target">
+            <fileset dir="studio-schemaeditor-plugin/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -127,7 +121,7 @@
         <ant dir="studio-schemaeditor-help" inheritAll="no" />
         <!-- Copy of the Schemas Editor Help Plugin in the "plugins" folder of the RCP
app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-schemaeditor-help/target">
+            <fileset dir="studio-schemaeditor-help/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -136,7 +130,7 @@
         <ant dir="studio-ldapbrowser-core" inheritAll="no" />
         <!-- Copy of the Browser Core Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-ldapbrowser-core/target">
+            <fileset dir="studio-ldapbrowser-core/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -145,7 +139,7 @@
         <ant dir="studio-ldapbrowser-common" inheritAll="no" />
         <!-- Copy of the Browser Common Plugin in the "plugins" folder of the RCP app
-->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-ldapbrowser-common/target">
+            <fileset dir="studio-ldapbrowser-common/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -154,7 +148,7 @@
         <ant dir="studio-ldifeditor" inheritAll="no" />
         <!-- Copy of the LDIF Editor Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-ldifeditor/target">
+            <fileset dir="studio-ldifeditor/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -163,7 +157,7 @@
         <ant dir="studio-ldapbrowser-ui" inheritAll="no" />
         <!-- Copy of the Browser UI Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-ldapbrowser-ui/target">
+            <fileset dir="studio-ldapbrowser-ui/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -172,7 +166,7 @@
         <ant dir="studio-ldapbrowser-help" inheritAll="no" />
         <!-- Copy of the Browser Help Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-ldapbrowser-help/target">
+            <fileset dir="studio-ldapbrowser-help/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -181,7 +175,7 @@
         <ant dir="studio-valueeditors" inheritAll="no" />
         <!-- Copy of the Value Editors Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-valueeditors/target">
+            <fileset dir="studio-valueeditors/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -190,7 +184,7 @@
         <ant dir="studio-aciitemeditor" inheritAll="no" />
         <!-- Copy of the ACI Item Edtior Plugin in the "plugins" folder of the RCP app
-->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-aciitemeditor/target">
+            <fileset dir="studio-aciitemeditor/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -199,7 +193,7 @@
         <ant dir="studio-jars" inheritAll="no" />
         <!-- Copy of the Jars Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-jars/target">
+            <fileset dir="studio-jars/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -208,7 +202,7 @@
         <ant dir="studio-apacheds-configuration" inheritAll="no" />
         <!-- Copy of the Jars Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-apacheds-configuration/target">
+            <fileset dir="studio-apacheds-configuration/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -217,7 +211,7 @@
         <ant dir="studio-apacheds-configuration-help" inheritAll="no" />
         <!-- Copy of the Jars Plugin in the "plugins" folder of the RCP app -->
         <copy todir="${application.plugins}">
-            <fileset dir="${basedir}/studio-apacheds-configuration-help/target">
+            <fileset dir="studio-apacheds-configuration-help/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -227,7 +221,7 @@
         <ant dir="studio-rcp-feature" inheritAll="no" />
         <!-- Copy of the Apache Directory Studio RCP Feature in the "features" folder
-->
         <copy todir="${application.features}">
-            <fileset dir="${basedir}/studio-rcp-feature/target">
+            <fileset dir="studio-rcp-feature/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -236,7 +230,7 @@
         <ant dir="studio-schemaeditor-feature" inheritAll="no" />
         <!-- Copy of the Schemas Editor Feature in the "features" folder -->
         <copy todir="${application.features}">
-            <fileset dir="${basedir}/studio-schemaeditor-feature/target">
+            <fileset dir="studio-schemaeditor-feature/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -245,7 +239,7 @@
 	    <ant dir="studio-ldapbrowser-feature" inheritAll="no" />
 	    <!-- Copy of the LDAP Browser Feature in the "features" folder -->
 	    <copy todir="${application.features}">
-            <fileset dir="${basedir}/studio-ldapbrowser-feature/target">
+            <fileset dir="studio-ldapbrowser-feature/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
@@ -254,13 +248,13 @@
         <ant dir="studio-apacheds-configuration-feature" inheritAll="no" />
         <!-- Copy of the Apache DS Configuration Feature in the "features" folder -->
         <copy todir="${application.features}">
-            <fileset dir="${basedir}/studio-apacheds-configuration-feature/target">
+            <fileset dir="studio-apacheds-configuration-feature/target">
                 <include name="*.jar" />
             </fileset>
         </copy>
 
     	<!-- Copy the legal stuff -->
-        <copy todir="${studio-complete.build}">
+        <copy todir="${target.build}">
           <fileset dir="${basedir}/docs">
                <include name="LICENSE.txt"/>
                <include name="NOTICE.txt"/>
@@ -272,53 +266,41 @@
         <antcall target="setPermission_${studio-rcp.os.name}" />
     </target>
 	
-    <!-- ================================== -->
-    <!--        Set Right Permissions       -->
-    <!-- ================================== -->
+
+	<!-- SETPERMISSION_MACOSX TASK -->
     <target name="setPermission_macosx" description="Sets the right permissions on Mac
OS X">
-        <chmod file="${studio-complete.build}/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio"
perm="755"/>
+        <chmod file="${target.build}/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio"
perm="755"/>
     </target>
-    
+
+	
+	<!-- SETPERMISSION_LINUX TASK -->
     <target name="setPermission_linux" description="Sets the right permissions on Linux">
-        <chmod file="${studio-complete.build}/ApacheDirectoryStudio" perm="755"/>
+        <chmod file="${target.build}/ApacheDirectoryStudio" perm="755"/>
     </target>
 
+
+	<!-- SETPERMISSION_WIN32 TASK -->
     <target name="setPermission_win32" description="Sets the right permissions on Windows">
-        <chmod file="${studio-complete.build}/Apache Directory Studio.exe" perm="755"
/>
-    </target>
-    
-    <!-- ================================== -->
-    <!--         Repackage Mac OS X         -->
-    <!-- ================================== -->
-    <target name="repackage_MacOSX" description="Special repackage for Mac OS X" if="isTargetMacOSX">
-        <property name="app.dir" location="${studio-complete.build}/Apache Directory Studio.app"
/>
-        <property name="java.dir" location="${app.dir}/Contents/Resources/Java" />
-        <mkdir dir="${java.dir}"/>
-        <move todir="${java.dir}">
-          <fileset dir="${studio-complete.build}">
-               <exclude name="Apache Directory Studio.app/**"/>
-          </fileset>
-        </move>
+        <chmod file="${target.build}/Apache Directory Studio.exe" perm="755" />
     </target>
+	
 
-    <!-- ================================== -->
-    <!--             USERGUIDES             -->
-    <!-- ================================== -->
+	<!-- USERGUIDES TASK -->
     <target name="userguides" description="Generates the user guides">
         <!-- Creation of the folders -->
-        <mkdir dir="${studio-complete.userguides}" />
+        <mkdir dir="${target.userguides}" />
 
         <!-- Creation of the Apache Directory Studio RCP user guides -->
         <ant dir="studio-rcp-help" inheritAll="no" target="static-html" />
         <ant dir="studio-rcp-help" inheritAll="no" target="static-pdf" />
         <!-- Copy of the RCP user guides -->
-        <mkdir dir="${studio-complete.userguides}/ldap_studio" />
-        <copy todir="${studio-complete.userguides}/ldap_studio">
+        <mkdir dir="${target.userguides}/apache_directory_studio" />
+        <copy todir="${target.userguides}/apache_directory_studio">
             <fileset dir="${basedir}/studio-rcp-help/target/html">
                 <include name="**" />
             </fileset>
         </copy>
-        <copy todir="${studio-complete.userguides}">
+        <copy todir="${target.userguides}">
             <fileset dir="${basedir}/studio-rcp-help/target/pdf">
                 <include name="**/*.pdf" />
             </fileset>
@@ -328,13 +310,13 @@
         <ant dir="studio-ldapbrowser-help" inheritAll="no" target="static-html" />
         <ant dir="studio-ldapbrowser-help" inheritAll="no" target="static-pdf" />
         <!-- Copy of the browser user guides -->
-        <mkdir dir="${studio-complete.userguides}/ldap_browser" />
-        <copy todir="${studio-complete.userguides}/ldap_browser">
+        <mkdir dir="${target.userguides}/ldap_browser" />
+        <copy todir="${target.userguides}/ldap_browser">
             <fileset dir="${basedir}/studio-ldapbrowser-help/target/html">
                 <include name="**" />
             </fileset>
         </copy>
-        <copy todir="${studio-complete.userguides}">
+        <copy todir="${target.userguides}">
             <fileset dir="${basedir}/studio-ldapbrowser-help/target/pdf">
                 <include name="**/*.pdf" />
             </fileset>
@@ -344,91 +326,120 @@
         <ant dir="studio-schemaeditor-help" inheritAll="no" target="static-html" />
         <ant dir="studio-schemaeditor-help" inheritAll="no" target="static-pdf" />
         <!-- Copy of the schemas user guides -->
-        <mkdir dir="${studio-complete.userguides}/schemas_editor" />
-        <copy todir="${studio-complete.userguides}/schemas_editor">
+        <mkdir dir="${target.userguides}/schemas_editor" />
+        <copy todir="${target.userguides}/schemas_editor">
             <fileset dir="${basedir}/studio-schemaeditor-help/target/html">
                 <include name="**" />
             </fileset>
         </copy>
-        <copy todir="${studio-complete.userguides}">
+        <copy todir="${target.userguides}">
             <fileset dir="${basedir}/studio-schemaeditor-help/target/pdf">
                 <include name="**/*.pdf" />
             </fileset>
         </copy>
+    	
+        <!-- Creation of the Apache Directory Studio Apache DS Configration user guides
-->
+        <ant dir="studio-apacheds-configuration-help" inheritAll="no" target="static-html"
/>
+        <ant dir="studio-apacheds-configuration-help" inheritAll="no" target="static-pdf"
/>
+        <!-- Copy of the schemas user guides -->
+        <mkdir dir="${target.userguides}/apacheds_configuration" />
+        <copy todir="${target.userguides}/apacheds_configuration">
+            <fileset dir="${basedir}/studio-apacheds-configuration-help/target/html">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${target.userguides}">
+            <fileset dir="${basedir}/studio-apacheds-configuration-help/target/pdf">
+                <include name="**/*.pdf" />
+            </fileset>
+        </copy>
     </target>
 
-    <!-- ================================== -->
-    <!--              JAVADOC               -->
-    <!-- ================================== -->
+
+	<!-- JAVADOC TASK -->
     <target name="javadoc" description="Generate Javadoc files">
-        <ant dir="studio-rcp" inheritAll="no" target="javadoc" />
-        <ant dir="studio-schemaeditor-plugin" inheritAll="no" target="javadoc" />
+        <ant dir="studio-aciitemeditor" inheritAll="no" target="javadoc" />
+        <ant dir="studio-apacheds-configuration" inheritAll="no" target="javadoc" />
         <ant dir="studio-dsml-parser" inheritAll="no" target="javadoc" />
+        <ant dir="studio-ldapbrowser-common" inheritAll="no" target="javadoc" />
         <ant dir="studio-ldapbrowser-core" inheritAll="no" target="javadoc" />
         <ant dir="studio-ldapbrowser-ui" inheritAll="no" target="javadoc" />
-        <ant dir="studio-aciitemeditor" inheritAll="no" target="javadoc" />
+        <ant dir="studio-ldifeditor" inheritAll="no" target="javadoc" />
+        <ant dir="studio-rcp" inheritAll="no" target="javadoc" />
+        <ant dir="studio-schemaeditor-plugin" inheritAll="no" target="javadoc" />
+        <ant dir="studio-valueeditors" inheritAll="no" target="javadoc" />
     </target>
+	
 
-    <!-- ================================== -->
-    <!--              RESOLVE               -->
-    <!-- ================================== -->
-    <target name="resolve" description="Resolves the library dependencies using Ivy">
-        <ant dir="studio-rcp" inheritAll="no" target="resolve" />
-        <ant dir="studio-rcp-help" inheritAll="no" target="resolve" />
-        <ant dir="studio-schemaeditor-plugin" inheritAll="no" target="resolve" />
-        <ant dir="studio-schemaeditor-help" inheritAll="no" target="resolve" />
-        <ant dir="studio-dsml-parser" inheritAll="no" target="resolve" />
-        <ant dir="studio-ldapbrowser-core" inheritAll="no" target="resolve" />
-        <ant dir="studio-ldapbrowser-common" inheritAll="no" target="resolve" />
-        <ant dir="studio-ldifeditor" inheritAll="no" target="resolve" />
-        <ant dir="studio-ldapbrowser-ui" inheritAll="no" target="resolve" />
-        <ant dir="studio-ldapbrowser-help" inheritAll="no" target="resolve" />
-        <ant dir="studio-valueeditors" inheritAll="no" target="resolve" />
-        <ant dir="studio-aciitemeditor" inheritAll="no" target="resolve" />
+	<!-- RETRIEVE-DEPENDENCIES TASK -->
+    <target name="retrieve-dependencies" description="Resolves the library dependencies
using Ivy">
+        <ant dir="studio-aciitemeditor" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-apacheds-configuration" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-apacheds-configuration-help" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-dsml-parser" inheritAll="no" target="retrieve-dependencies" />
         <ant dir="studio-jars" inheritAll="no" target="resolve" />
-        <ant dir="studio-apacheds-configuration" inheritAll="no" target="resolve" />
-        <ant dir="studio-apacheds-configuration-help" inheritAll="no" target="resolve"
/>
+        <ant dir="studio-ldapbrowser-common" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-ldapbrowser-core" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-ldapbrowser-help" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-ldapbrowser-ui" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-ldifeditor" inheritAll="no" target="retrieve-dependencies" />
+        <ant dir="studio-rcp" inheritAll="no" target="retrieve-dependencies" />
+        <ant dir="studio-rcp-help" inheritAll="no" target="retrieve-dependencies" />
+        <ant dir="studio-schemaeditor-help" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-schemaeditor-plugin" inheritAll="no" target="retrieve-dependencies"
/>
+        <ant dir="studio-valueeditors" inheritAll="no" target="retrieve-dependencies"
/>
     </target>
+	
 
-    <!-- ================================== -->
-    <!--               CLEAN                -->
-    <!-- ================================== -->
+	<!-- RESOLVE TASK -->
+	<target name="resolve" depends="retrieve-dependencies" description="Backwards compatibility
with older system and shortcut"/>
+
+	
+	<!-- CLEAN TASK -->
     <target name="clean" description="Deletes any generated file (javadoc, classes, jars,
distribution)">
+        <ant dir="studio-aciitemeditor" inheritAll="no" target="clean" />
+        <ant dir="studio-apacheds-configuration" inheritAll="no" target="clean" />
+        <ant dir="studio-apacheds-configuration-help" inheritAll="no" target="clean" />
+        <ant dir="studio-apacheds-configuration-feature" inheritAll="no" target="clean"
/>
+        <ant dir="studio-dsml-parser" inheritAll="no" target="clean" />
+        <ant dir="studio-jars" inheritAll="no" target="clean" />
+        <ant dir="studio-ldapbrowser-common" inheritAll="no" target="clean" />
+        <ant dir="studio-ldapbrowser-core" inheritAll="no" target="clean" />
+        <ant dir="studio-ldapbrowser-feature" inheritAll="no" target="clean"/>
+        <ant dir="studio-ldapbrowser-help" inheritAll="no" target="clean" />
+        <ant dir="studio-ldapbrowser-ui" inheritAll="no" target="clean" />
+        <ant dir="studio-ldifeditor" inheritAll="no" target="clean" />
         <ant dir="studio-rcp" inheritAll="no" target="clean"/>
         <ant dir="studio-rcp-feature" inheritAll="no" target="clean"/>
         <ant dir="studio-rcp-help" inheritAll="no" target="clean"/>
-        <ant dir="studio-schemaeditor-plugin" inheritAll="no" target="clean"/>
-        <ant dir="studio-schemaeditor-help" inheritAll="no" target="clean" />
         <ant dir="studio-schemaeditor-feature" inheritAll="no" target="clean"/>
-        <ant dir="studio-ldapbrowser-core" inheritAll="no" target="clean" />
-        <ant dir="studio-ldapbrowser-common" inheritAll="no" target="clean" />
-        <ant dir="studio-ldifeditor" inheritAll="no" target="clean" />
-        <ant dir="studio-ldapbrowser-ui" inheritAll="no" target="clean" />
-        <ant dir="studio-ldapbrowser-help" inheritAll="no" target="clean" />
-        <ant dir="studio-ldapbrowser-feature" inheritAll="no" target="clean"/>
-        <ant dir="studio-valueeditors" inheritAll="no" target="clean" />
-        <ant dir="studio-aciitemeditor" inheritAll="no" target="clean" />
-        <ant dir="studio-jars" inheritAll="no" target="clean" />
-        <ant dir="studio-apacheds-configuration" inheritAll="no" target="clean" />
-        <ant dir="studio-apacheds-configuration-help" inheritAll="no" target="clean" />
+        <ant dir="studio-schemaeditor-help" inheritAll="no" target="clean" />
+        <ant dir="studio-schemaeditor-plugin" inheritAll="no" target="clean"/>
         <ant dir="studio-updatesite" inheritAll="no" target="clean" />
-        <delete dir="${studio-complete.output}" />
+        <ant dir="studio-valueeditors" inheritAll="no" target="clean" />
+        <delete dir="${target}" />
     </target>
 
+
+	<!-- RELEASE TASK -->
     <target name="release" description="Releases">
         <!-- Setting some properties -->
-        <property name="packages-folder" value="${basedir}/packages" />
-        <property name="packages-folder.macosx" value="${packages-folder}/MacOSX" />
-        <property name="packages-folder.windows" value="${packages-folder}/Windows" />
-        <property name="packages-folder.linux-i386" value="${packages-folder}/Linuxi386"
/>
-        <property name="packages-folder.linux-ppc" value="${packages-folder}/LinuxPPC"
/>
-        <property name="packages-folder.updatesite" value="${packages-folder}/updatesite"
/>
+        <property name="packages" value="${basedir}/packages" />
+        <property name="packages.macosx" value="${packages}/ApacheDirectoryStudio_MacOSX.tar.gz"
/>
+        <property name="packages.windows" value="${packages}/ApacheDirectoryStudio_Windows.zip"
/>
+        <property name="packages.linux-i386" value="${packages}/ApacheDirectoryStudio_Linux_i386.tar.gz"
/>
+        <property name="packages.linux-ppc" value="${packages}/ApacheDirectoryStudio_Linux_PPC.tar.gz"
/>
+        <property name="packages.updatesite" value="${packages}/ApacheDirectoryStudio_UpdateSite.zip"
/>
+
 
         <!-- Cleaning the 'packages' folder (just in case) -->
         <delete includeemptydirs="true" failonerror="no">
-			<fileset dir="${packages-folder}" />
+			<fileset dir="${packages}" />
 		</delete>
 
+        <!-- Creating the 'packages' folder -->
+    	<mkdir dir="${packages}"/>
+
         <!-- Cleaning latest build (just in case) -->
         <antcall target="clean" inheritall="false"/>
         <!-- Generating Apache Directory Studio for Mac OS X -->
@@ -437,9 +448,15 @@
             <param name="studio-rcp.os.arch" value="i386"/>
             <param name="studio-rcp.os.extension" value=".app"/>
         </antcall>
-        <move todir="${packages-folder.macosx}">
-          <fileset dir="${studio-complete.output}"/>
-        </move>
+        <tar compression="gzip" destfile="${packages.macosx}">
+            <tarfileset dir="${target}" mode="755">
+				<include name="ApacheDirectoryStudio/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio"
/>
+			</tarfileset>
+            <tarfileset dir="${target}">
+				<include name="**" />
+				<exclude name="ApacheDirectoryStudio/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio"
/>
+			</tarfileset>
+        </tar>
 
         <!-- Cleaning latest build -->
         <antcall target="clean" inheritall="false"/>
@@ -449,9 +466,7 @@
             <param name="studio-rcp.os.arch" value="x86"/>
             <param name="studio-rcp.os.extension" value=".exe"/>
         </antcall>
-        <move todir="${packages-folder.windows}">
-          <fileset dir="${studio-complete.output}"/>
-        </move>
+    	<zip destfile="${packages.windows}" basedir="${target}"/>
 
         <!-- Cleaning latest build -->
         <antcall target="clean" inheritall="false"/>
@@ -461,14 +476,13 @@
             <param name="studio-rcp.os.arch" value="i386"/>
             <param name="studio-rcp.os.extension" value=""/>
         </antcall>
-		<mkdir dir="${packages-folder.linux-i386}" />
-        <tar compression="gzip" destfile="${packages-folder.linux-i386}/LDAP_Studio_Linux_i386.tar.gz">
-            <tarfileset dir="${studio-complete.output}" mode="755">
-				<include name="studio/studio" />
+        <tar compression="gzip" destfile="${packages.linux-i386}">
+            <tarfileset dir="${target}" mode="755">
+				<include name="ApacheDirectoryStudio/ApacheDirectoryStudio" />
 			</tarfileset>
-            <tarfileset dir="${studio-complete.output}">
+            <tarfileset dir="${target}">
 				<include name="**" />
-				<exclude name="studio/studio" />
+				<exclude name="ApacheDirectoryStudio/ApacheDirectoryStudio" />
 			</tarfileset>
         </tar>
 
@@ -480,14 +494,13 @@
             <param name="studio-rcp.os.arch" value="ppc"/>
             <param name="studio-rcp.os.extension" value=""/>
         </antcall>
-		<mkdir dir="${packages-folder.linux-ppc}" />
-        <tar compression="gzip" destfile="${packages-folder.linux-ppc}/LDAP_Studio_Linux_PPC.tar.gz">
-            <tarfileset dir="${studio-complete.output}" mode="755">
-				<include name="studio/studio" />
+        <tar compression="gzip" destfile="${packages.linux-ppc}">
+            <tarfileset dir="${target}" mode="755">
+				<include name="ApacheDirectoryStudio/ApacheDirectoryStudio" />
 			</tarfileset>
-            <tarfileset dir="${studio-complete.output}">
+            <tarfileset dir="${target}">
 				<include name="**" />
-				<exclude name="studio/studio" />
+				<exclude name="ApacheDirectoryStudio/ApacheDirectoryStudio" />
 			</tarfileset>
         </tar>
         
@@ -495,13 +508,6 @@
         <antcall target="clean" inheritall="false"/>
         <!-- Generating Apache Directory Studio's update site -->
         <ant dir="studio-updatesite" inheritAll="no"/>
-		<mkdir dir="${packages-folder.updatesite}" />
-		<move todir="${packages-folder.updatesite}">
-            <fileset dir="studio-updatesite">
-                <include name="features/**"/>
-                <include name="plugins/**"/>
-                <include name="site--xml.html"/>
-            </fileset>
-        </move>
+    	<zip destfile="${packages.updatesite}" basedir="studio-updatesite/target"/>
     </target>
 </project>



Mime
View raw message