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 2007/01/18 17:58:34 UTC

svn commit: r497497 - in /directory/trunks/ldapstudio: build.xml dependencies/eclipse/3.2/macosx/i386/rcp/eclipse.app/Contents/Info.plist dependencies/eclipse/3.2/macosx/ppc/rcp/eclipse.app/Contents/Info.plist

Author: pamarcelot
Date: Thu Jan 18 08:58:33 2007
New Revision: 497497

URL: http://svn.apache.org/viewvc?view=rev&rev=497497
Log:
Updating the build system on Mac OS X to be able to hide the configuration, features and plugins folders, as well as the startup.jar file inside the Application itself.

Modified:
    directory/trunks/ldapstudio/build.xml
    directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/i386/rcp/eclipse.app/Contents/Info.plist
    directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/ppc/rcp/eclipse.app/Contents/Info.plist

Modified: directory/trunks/ldapstudio/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/build.xml?view=diff&rev=497497&r1=497496&r2=497497
==============================================================================
--- directory/trunks/ldapstudio/build.xml (original)
+++ directory/trunks/ldapstudio/build.xml Thu Jan 18 08:58:33 2007
@@ -26,6 +26,9 @@
     <condition property="ldapstudio-rcp.os.name" value="macosx" >
             <os name="Mac OS X"/>
     </condition>
+    <condition property="isMacOSX" value="true" >
+            <os name="Mac OS X"/>
+    </condition>
     <condition property="ldapstudio-rcp.os.name" value="linux" >
             <os family="unix" />
     </condition>
@@ -156,6 +159,9 @@
 
         <!-- Setting Permissions -->
         <antcall target="setPermission_${ldapstudio-rcp.os.name}" />
+        
+        <!-- Special repackaging for Mac OS X -->
+        <antcall target="repackage_MacOSX" />
     </target>
 	
     <!-- ================================== -->
@@ -171,6 +177,13 @@
 
     <target name="setPermission_win32" description="Sets the right permissions on Windows">
         <chmod file="${ldapstudio-complete.build}/LDAP Studio.exe" perm="755" />
+    </target>
+    
+    <!-- ================================== -->
+    <!--         Repackage Mac OS X         -->
+    <!-- ================================== -->
+    <target name="repackage_MacOSX" description="Special repackage for Mac OS X" if="isMacOSX">
        <property name="app.dir" location="${ldapstudio-complete.build}/LDAP Studio.app" />
        <property name="java.dir" location="${app.dir}/Contents/Resources/Java" />
+        <mkdir dir="${java.dir}"/>
        <move todir="${java.dir}">
          <fileset dir="${ldapstudio-complete.build}">
               <exclude name="LDAP Studio.app/**"/>
          </fileset>
        </move>
     </target>
 
     <!-- ================================== -->

Modified: directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/i386/rcp/eclipse.app/Contents/Info.plist
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/i386/rcp/eclipse.app/Contents/Info.plist?view=diff&rev=497497&r1=497496&r2=497497
==============================================================================
--- directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/i386/rcp/eclipse.app/Contents/Info.plist (original)
+++ directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/i386/rcp/eclipse.app/Contents/Info.plist Thu Jan 18 08:58:33 2007
@@ -9,23 +9,11 @@
 		 <key>CFBundleInfoDictionaryVersion</key>
 		 <string>6.0</string>
 		 <key>CFBundleName</key>
-		 <string>LDAPStudio</string>
+		 <string>LDAP Studio</string>
 		 <key>CFBundlePackageType</key>
 		 <string>APPL</string>
 		 <key>CFBundleSignature</key>
 		 <string>????</string>
-		 <key>Eclipse</key>
-		 <array>
-		 		 <string>-startup</string>
-		 		 <string>../../../startup.jar</string>
-		 		 <string>-vmargs</string>
-		 		 <string>-XstartOnFirstThread</string>
-		 		 <string>-Xms30M</string>
-		 		 <string>-Xmx150M</string>
-		 		 <string>-Dorg.eclipse.swt.internal.carbon.smallFonts</string>
-		 		 <string>-Dorg.eclipse.swt.internal.carbon.noFocusRing</string>
-		 </array>
-		 <key>LSUIElement</key>
-		 <string>1</string>
+		 <key>Eclipse</key>
         <array>
             <string>-vm</string>
             <string>/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Commands/java</string>
             <string>-startup</string>
             <string>$APP_PACKAGE/Contents/Resources/Java/startup.jar</string>
             <string>-keyring</string>
             <string>~/.eclipse_keyring</string>
             <string>-consoleLog</string>
             <string>-showlocation</string>
         </array>
     <key>LSBackgroundOnly</key>
     <string>1</string>
     <key>WorkingDirectory</key>
     <string>$APP_PACKAGE/Contents/Resources/Java</string>
 </dict>
 </plist>

Modified: directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/ppc/rcp/eclipse.app/Contents/Info.plist
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/ppc/rcp/eclipse.app/Contents/Info.plist?view=diff&rev=497497&r1=497496&r2=497497
==============================================================================
--- directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/ppc/rcp/eclipse.app/Contents/Info.plist (original)
+++ directory/trunks/ldapstudio/dependencies/eclipse/3.2/macosx/ppc/rcp/eclipse.app/Contents/Info.plist Thu Jan 18 08:58:33 2007
@@ -9,23 +9,11 @@
 		 <key>CFBundleInfoDictionaryVersion</key>
 		 <string>6.0</string>
 		 <key>CFBundleName</key>
-		 <string>LDAPStudio</string>
+		 <string>LDAP Studio</string>
 		 <key>CFBundlePackageType</key>
 		 <string>APPL</string>
 		 <key>CFBundleSignature</key>
 		 <string>????</string>
-		 <key>Eclipse</key>
-		 <array>
-		 		 <string>-startup</string>
-		 		 <string>../../../startup.jar</string>
-		 		 <string>-vmargs</string>
-		 		 <string>-XstartOnFirstThread</string>
-		 		 <string>-Xms30M</string>
-		 		 <string>-Xmx150M</string>
-		 		 <string>-Dorg.eclipse.swt.internal.carbon.smallFonts</string>
-		 		 <string>-Dorg.eclipse.swt.internal.carbon.noFocusRing</string>
-		 </array>
-		 <key>LSUIElement</key>
-		 <string>1</string>
+		 <key>Eclipse</key>
         <array>
             <string>-vm</string>
             <string>/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Commands/java</string>
             <string>-startup</string>
             <string>$APP_PACKAGE/Contents/Resources/Java/startup.jar</string>
             <string>-keyring</string>
             <string>~/.eclipse_keyring</string>
             <string>-consoleLog</string>
             <string>-showlocation</string>
         </array>
     <key>LSBackgroundOnly</key>
     <string>1</string>
     <key>WorkingDirectory</key>
     <string>$APP_PACKAGE/Contents/Resources/Java</string>
 </dict>
 </plist>