[Title] Fixed to support MACOS build with dibs

diff --git a/InstallManager_java/build.xml b/InstallManager_java/build.xml
index 25e5fcb..3f2e353 100644 (file)
--- a/InstallManager_java/build.xml
+++ b/InstallManager_java/build.xml
@@ -10,6 +10,9 @@
        <property name="dist.dir"  location="dist"/>
        <property name="jarinjar"  value="${lib.dir}/jarinjar.zip"/>
 
+       <property name="ant.build.javac.source" value="1.6"/>
+       <property name="ant.build.javac.target" value="1.6"/>
+
        <target name="init-linux-32" if="is-linux-32">
                <property name="swtjar" value="swt-linux-32.jar"/>
                <property name="PLATFORM" value="linux32"/>

diff --git a/macos/build.xml b/macos/build.xml
index bdb25d3..f7eac84 100644 (file)
--- a/macos/build.xml
+++ b/macos/build.xml
@@ -36,12 +36,13 @@
         <copy file="${IMAGE_PATH}/${MAC_BACKGROUND}" todir="${basedir}" />\r
   -->   \r
     <copy file="${IMAGE_PATH}/${MAC_ICON}" todir="${basedir}" />\r
+    <copy file="installmanager.conf" todir="${basedir}/Java" />\r
     <jarbundler dir="." name="${APP_NAME}" mainclass="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader" jar="InstallManager.jar"\r
       verbose="true" startOnMainThread="true"\r
       workingdirectory="$APP_PACKAGE/Contents/Resources/Java" icon ="${MAC_ICON}"\r
       arguments="${ARGUMENT}"\r
     > \r
-      <resourcefileset dir="." includes="*.conf"/>\r
+      <resourcefileset dir="." includes="Java/*.conf"/>\r
     </jarbundler>\r
   </target>\r
     \r