You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2006/12/20 11:35:53 UTC

svn commit: r489022 - in /directory/sandbox/pamarcelot/ldapstudio: dependencies/eclipse/3.2/macosx/ dependencies/eclipse/3.2/macosx/i386/ dependencies/eclipse/3.2/macosx/i386/rcp/ dependencies/eclipse/3.2/macosx/ppc/ dependencies/eclipse/3.2/macosx/rcp...

Author: pamarcelot
Date: Wed Dec 20 02:35:52 2006
New Revision: 489022

URL: http://svn.apache.org/viewvc?view=rev&rev=489022
Log:
Updating the ldapstudio-rcp build script to be able to build on ppc and i386 platforms.

Added:
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/macosx/i386/
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/macosx/i386/org.eclipse.swt.carbon.macosx_3.2.0.v3232l.jar
      - copied unchanged from r489012, directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/macosx/org.eclipse.swt.carbon.macosx_3.2.0.v3232l.jar
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/macosx/i386/rcp/
      - copied from r489012, directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/macosx/rcp/
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/macosx/ppc/
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/win32/i386/
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/win32/i386/org.eclipse.swt.win32.win32.x86_3.2.0.v3232l.jar
      - copied unchanged from r489012, directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/win32/org.eclipse.swt.win32.win32.x86_3.2.0.v3232l.jar
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/win32/i386/rcp/
      - copied from r489012, directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/win32/rcp/
Removed:
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/macosx/org.eclipse.swt.carbon.macosx_3.2.0.v3232l.jar
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/macosx/rcp/
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/win32/org.eclipse.swt.win32.win32.x86_3.2.0.v3232l.jar
    directory/sandbox/pamarcelot/ldapstudio/dependencies/eclipse/3.2/win32/rcp/
Modified:
    directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml

Modified: directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml?view=diff&rev=489022&r1=489021&r2=489022
==============================================================================
--- directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml (original)
+++ directory/sandbox/pamarcelot/ldapstudio/ldapstudio-rcp/build.xml Wed Dec 20 02:35:52 2006
@@ -56,7 +56,10 @@
 	</condition>
 	<condition property="ldapstudio-rcp.os.extension" value=".exe">
 		<os family="windows" />
-	</condition>	
+	</condition>
+
+	<property name="ldapstudio-rcp.os.arch" value="${os.arch}" />
+
 
 	<!-- ================================== -->
 	<!--              RESOLVE               -->
@@ -161,11 +164,11 @@
 	<target name="product" depends="jar" description="Create the standalone eclipse RCP application">
 		<mkdir dir="${ldapstudio-rcp.application}" />
 		<copy todir="${ldapstudio-rcp.application}" failonerror="true" overwrite="true" preservelastmodified="yes">
-			<fileset dir="${ldapstudio-rcp.eclipse.dir}/${ldapstudio-rcp.eclipse.version}/${ldapstudio-rcp.os.name}/rcp/" />
+			<fileset dir="${ldapstudio-rcp.eclipse.dir}/${ldapstudio-rcp.eclipse.version}/${ldapstudio-rcp.os.name}/${ldapstudio-rcp.os.arch}/rcp/" />
 		</copy>
 		<mkdir dir="${ldapstudio-rcp.application}/plugins" />
 		<copy todir="${ldapstudio-rcp.application}/plugins" failonerror="true" overwrite="true">
-			<fileset dir="${ldapstudio-rcp.eclipse.dir}/${ldapstudio-rcp.eclipse.version}/${ldapstudio-rcp.os.name}" excludes="rcp/" />
+			<fileset dir="${ldapstudio-rcp.eclipse.dir}/${ldapstudio-rcp.eclipse.version}/${ldapstudio-rcp.os.name}/${ldapstudio-rcp.os.arch}" excludes="rcp/" />
 			<fileset dir="${ldapstudio-rcp.eclipse.dir}/${ldapstudio-rcp.eclipse.version}/plugins" />
 		</copy>
 		<move file="${ldapstudio-rcp.application}/eclipse${ldapstudio-rcp.os.extension}" tofile="${ldapstudio-rcp.application}/LDAP Studio${ldapstudio-rcp.os.extension}">