directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r533622 - in /directory/ldapstudio/trunk: build.xml ldapstudio-rcp/build.xml
Date Mon, 30 Apr 2007 08:27:59 GMT
Author: seelmann
Date: Mon Apr 30 01:27:58 2007
New Revision: 533622

URL: http://svn.apache.org/viewvc?view=rev&rev=533622
Log:
Renamed the install folders on Linux to 'ldapstudio'

Modified:
    directory/ldapstudio/trunk/build.xml
    directory/ldapstudio/trunk/ldapstudio-rcp/build.xml

Modified: directory/ldapstudio/trunk/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/build.xml?view=diff&rev=533622&r1=533621&r2=533622
==============================================================================
--- directory/ldapstudio/trunk/build.xml (original)
+++ directory/ldapstudio/trunk/build.xml Mon Apr 30 01:27:58 2007
@@ -20,7 +20,6 @@
     <property name="project.name" value="ldapstudio-complete" />
     <property name="project.version" value="1.0.0" />
     <property name="ldapstudio-complete.output" value="${basedir}/target" />
-    <property name="ldapstudio-complete.build" value="${ldapstudio-complete.output}/LDAP
Studio" />    
     <property name="ldapstudio-complete.userguides" value="${ldapstudio-complete.output}/userguides"
/>    
     
     <!-- Setting up OS Name-->
@@ -45,6 +44,17 @@
         <equals arg1="${ldapstudio-rcp.os.name}" arg2="win32"/>
     </condition>
 
+	<!-- Setting up build folder -->
+	<condition property="ldapstudio-complete.build" value="${ldapstudio-complete.output}/LDAP
Studio" >
+        <or>
+            <equals arg1="${ldapstudio-rcp.os.name}" arg2="macosx"/>
+            <equals arg1="${ldapstudio-rcp.os.name}" arg2="win32"/>
+        </or>
+    </condition>
+    <condition property="ldapstudio-complete.build" value="${ldapstudio-complete.output}/ldapstudio"
>
+            <equals arg1="${ldapstudio-rcp.os.name}" arg2="linux"/>
+    </condition>
+	
     <!-- Setting up a special property if target OS is Mac OS X-->
     <condition property="isTargetMacOSX" value="true" >
             <equals arg1="${ldapstudio-rcp.os.name}" arg2="macosx"/>
@@ -81,7 +91,7 @@
         <ant dir="ldapstudio-rcp" inheritAll="no" />
         <!-- Copy of the RCP app -->
         <copy todir="${ldapstudio-complete.build}">
-            <fileset dir="${basedir}/ldapstudio-rcp/target/LDAP Studio">
+            <fileset dir="${basedir}/ldapstudio-rcp/target/ldapstudio">
                 <include name="**" />
             </fileset>
         </copy>
@@ -258,6 +268,15 @@
 			</fileset>
 		</copy>
 
+    	<!-- Copy the legal stuff -->
+        <copy todir="${ldapstudio-complete.build}">
+          <fileset dir="${basedir}/docs">
+               <include name="LICENSE.txt"/>
+               <include name="NOTICE.txt"/>
+               <include name="Release Notes.txt"/>
+          </fileset>
+        </copy>
+    	
         <!-- Setting Permissions -->
         <antcall target="setPermission_${ldapstudio-rcp.os.name}" />
         
@@ -415,64 +434,60 @@
 		</delete>
 
         <!-- Cleaning latest build (just in case) -->
-        <antcall target="clean"/>
+        <antcall target="clean" inheritall="false"/>
         <!-- Generating LDAP Studio for Mac OS X -->
-        <antcall target="bundle">
+        <antcall target="bundle" inheritall="false">
             <param name="ldapstudio-rcp.os.name" value="macosx"/>
             <param name="ldapstudio-rcp.os.arch" value="i386"/>
             <param name="ldapstudio-rcp.os.extension" value=".app"/>
         </antcall>
-        <copy todir="${ldapstudio-complete.build}">
          <fileset dir="${basedir}/docs">
              <include name="LICENSE.txt"/>
               <include name="NOTICE.txt"/>
              <include name="Release Notes.txt"/>
          </fileset>
      
 </copy>
         <move todir="${packages-folder.macosx}">
          <fileset dir="${ldapstudio-complete.output}"/>
       </move>
 
         <!-- Cleaning latest build -->
-        <antcall target="clean"/>
+        <antcall target="clean" inheritall="false"/>
         <!-- Generating LDAP Studio for Windows -->
-        <antcall target="bundle">
+        <antcall target="bundle" inheritall="false">
             <param name="ldapstudio-rcp.os.name" value="win32"/>
             <param name="ldapstudio-rcp.os.arch" value="x86"/>
             <param name="ldapstudio-rcp.os.extension" value=".exe"/>
         </antcall>
-        <copy todir="${ldapstudio-complete.build}">
          <fileset dir="${basedir}/docs">
              <include name="LICENSE.txt"/>
               <include name="NOTICE.txt"/>
              <include name="Release Notes.txt"/>
          </fileset>
      
 </copy>
         <move todir="${packages-folder.windows}">
          <fileset dir="${ldapstudio-complete.output}"/>
       </move>
 
         <!-- Cleaning latest build -->
-        <antcall target="clean"/>
+        <antcall target="clean" inheritall="false"/>
         <!-- Generating LDAP Studio for Linux i386 -->
-        <antcall target="bundle">
+        <antcall target="bundle" inheritall="false">
             <param name="ldapstudio-rcp.os.name" value="linux"/>
             <param name="ldapstudio-rcp.os.arch" value="i386"/>
             <param name="ldapstudio-rcp.os.extension" value=""/>
         </antcall>
-        <copy todir="${ldapstudio-complete.build}">
          <fileset dir="${basedir}/docs">
              <include name="LICENSE.txt"/>
               <include name="NOTICE.txt"/>
              <include name="Release Notes.txt"/>
          </fileset>
      
 </copy>
 		<mkdir dir="${packages-folder.linux-i386}" />
         <tar compression="gzip" destfile="${packages-folder.linux-i386}/LDAP_Studio_Linux_i386.tar.gz">
             <tarfileset dir="${ldapstudio-complete.output}" mode="755">
-				<include name="LDAP Studio/ldapstudio" />
+				<include name="ldapstudio/ldapstudio" />
 			</tarfileset>
             <tarfileset dir="${ldapstudio-complete.output}">
 				<include name="**" />
-				<exclude name="LDAP Studio/ldapstudio" />
+				<exclude name="ldapstudio/ldapstudio" />
 			</tarfileset>
         </tar>
 
         <!-- Cleaning latest build-->
-        <antcall target="clean"/>
+        <antcall target="clean" inheritall="false"/>
         <!-- Generating LDAP Studio for Linux PPC -->
-        <antcall target="bundle">
+        <antcall target="bundle" inheritall="false">
             <param name="ldapstudio-rcp.os.name" value="linux"/>
             <param name="ldapstudio-rcp.os.arch" value="ppc"/>
             <param name="ldapstudio-rcp.os.extension" value=""/>
         </antcall>
-        <copy todir="${ldapstudio-complete.build}">
          <fileset dir="${basedir}/docs">
              <include name="LICENSE.txt"/>
               <include name="NOTICE.txt"/>
              <include name="Release Notes.txt"/>
          </fileset>
      
 </copy>
 		<mkdir dir="${packages-folder.linux-ppc}" />
         <tar compression="gzip" destfile="${packages-folder.linux-ppc}/LDAP_Studio_Linux_PPC.tar.gz">
             <tarfileset dir="${ldapstudio-complete.output}" mode="755">
-				<include name="LDAP Studio/ldapstudio" />
+				<include name="ldapstudio/ldapstudio" />
 			</tarfileset>
             <tarfileset dir="${ldapstudio-complete.output}">
 				<include name="**" />
-				<exclude name="LDAP Studio/ldapstudio" />
+				<exclude name="ldapstudio/ldapstudio" />
 			</tarfileset>
         </tar>
         

Modified: directory/ldapstudio/trunk/ldapstudio-rcp/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-rcp/build.xml?view=diff&rev=533622&r1=533621&r2=533622
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-rcp/build.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-rcp/build.xml Mon Apr 30 01:27:58 2007
@@ -170,7 +170,7 @@
 	<!-- ================================== -->
 	<!--     Eclipse RCP-based product      -->
 	<!-- ================================== -->
-	<property name="ldapstudio-rcp.application" value="${ldapstudio-rcp.output}/LDAP Studio"
/>
+	<property name="ldapstudio-rcp.application" value="${ldapstudio-rcp.output}/ldapstudio"
/>
 	<property name="ldapstudio-rcp.application.zip" value="${ldapstudio-rcp.output}/${project.name}_${project.version}-${ldapstudio-rcp.os.name}-${os.arch}.zip"
/>
 
 	<target name="product" depends="jar" description="Create the standalone eclipse RCP application">



Mime
View raw message