Fixing installers ant script

luttero · Jun 2, 2023 · 9f21924 · 9f21924
1 parent c3916f8
commit 9f21924
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Maud.ipr b/Maud.ipr
@@ -4,6 +4,7 @@
     <buildFile url="file://$PROJECT_DIR$/build.xml">
       <additionalClassPath>
         <entry dir="file://$APPLICATION_HOME_DIR$/lib/ant/lib" />
+        <entry path="file://$PROJECT_DIR$/libs/ant-libs/infinitekind-appbundler-last/appbundler/bin/appbundler-1.2.jar" />
       </additionalClassPath>
       <customJdkName value="zulu-19" />
       <maximumHeapSize value="2048" />

diff --git a/build.xml b/build.xml
@@ -2058,7 +2058,7 @@
     </target>
 
 
-    <target name="bundle" depends="build_full">
+    <target name="bundle" depends="copy_full">
         <!-- Import the AppBundlerTaks from ant lib directory -->
         <taskdef name="bundleapp"
                  classname="com.oracle.appbundler.AppBundlerTask"
@@ -2792,27 +2792,27 @@
             <arg line="Maud.dmg.gz Maud"/>
         </exec-->
         <!--delete dir="${inst}/Maud_MacOSX64/Maud/Maud.app"/-->
-        <delete file="${dropbox}/macosx64/Maud.dmg.gz"/>
+        <delete file="${dropbox}/macosx64/Maud_intel64.dmg.gz"/>
          <exec dir="${app_osx}/" executable="/Users/luca/bin/mkdmg.pl" os="Mac OS X">
             <arg line="Maud.dmg.gz Maud.app"/>
         </exec>
-        <copy file="${app_osx}/Maud.dmg.gz" tofile="${dropbox}/macosx64/Maud.dmg.gz"/>
-        <delete file="${dropbox}/linux64/Maud.tar.gz"/>
+        <copy file="${app_osx}/Maud.dmg.gz" tofile="${dropbox}/macosx64/Maud_intel64.dmg.gz"/>
+        <!--delete file="${dropbox}/linux64/Maud.tar.gz"/>
         <exec dir="${inst}/Maud_linux64/" executable="tar" os="Mac OS X">
             <arg line="cfz ${dropbox}/linux64/Maud.tar.gz Maud"/>
-        </exec>
-        <delete file="${dropbox}/linux64_openjdk/Maud.tar.gz"/>
+        </exec-->
+        <delete file="${dropbox}/linux64/Maud.tar.gz"/>
         <exec dir="${inst}/Maud_linux64_ojdk/" executable="tar" os="Mac OS X">
-            <arg line="cfz ${dropbox}/linux64_openjdk/Maud.tar.gz Maud"/>
+            <arg line="cfz ${dropbox}/linux64/Maud.tar.gz Maud"/>
         </exec>
         <delete file="${dropbox}/windows64/Maud.zip"/>
-        <exec dir="${inst}/Maud_windows64/" executable="zip" os="Mac OS X">
+        <exec dir="${inst}/Maud_windows64_ojdk/" executable="zip" os="Mac OS X">
             <arg line="-r ${dropbox}/windows64/Maud.zip Maud"/>
         </exec>
-        <delete file="${dropbox}/windows64_openjdk/Maud.zip"/>
+        <!--delete file="${dropbox}/windows64_openjdk/Maud.zip"/>
         <exec dir="${inst}/Maud_windows64_ojdk/" executable="zip" os="Mac OS X">
             <arg line="-r ${dropbox}/windows64_openjdk/Maud.zip Maud"/>
-        </exec>
+        </exec-->
     </target>
 
     <target name="build_installers_only" description="build installers">