get rid of "internal" installer packages.

specify · Feb 25, 2020 · 20b573b · 20b573b
1 parent b16f48f
commit 20b573b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6,132 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,67 +61,37 @@ jobs:
  uses: actions/upload-artifact@v1
  with:
  name: Specify_windows_64.exe
- path: packages/external/Specify_windows_64.exe
+ path: packages/Specify_windows_64.exe
 
  - name: Upload Specify_windows.exe as artifact
  uses: actions/upload-artifact@v1
  with:
  name: Specify_windows.exe
- path: packages/external/Specify_windows.exe
+ path: packages/Specify_windows.exe
 
  - name: Upload Specify_unix_64.sh as artifact
  uses: actions/upload-artifact@v1
  with:
  name: Specify_unix_64.sh
- path: packages/external/Specify_unix_64.sh
+ path: packages/Specify_unix_64.sh
 
  - name: Upload Specify_unix.sh as artifact
  uses: actions/upload-artifact@v1
  with:
  name: Specify_unix.sh
- path: packages/external/Specify_unix.sh
+ path: packages/Specify_unix.sh
 
  - name: Upload Specify_macos.dmg as artifact
  uses: actions/upload-artifact@v1
  with:
  name: Specify_macos.dmg
- path: packages/external/Specify_macos.dmg
-
- - name: Upload Specify_windows_Internal_64.exe as artifact
- uses: actions/upload-artifact@v1
- with:
- name: Specify_windows_Internal_64.exe
- path: packages/internal/Specify_windows_Internal_64.exe
-
- - name: Upload Specify_windows_Internal.exe as artifact
- uses: actions/upload-artifact@v1
- with:
- name: Specify_windows_Internal.exe
- path: packages/internal/Specify_windows_Internal.exe
-
- - name: Upload Specify_unix_Internal.sh as artifact
- uses: actions/upload-artifact@v1
- with:
- name: Specify_unix_Internal.sh
- path: packages/internal/Specify_unix_Internal.sh
-
- - name: Upload Specify_macos_Internal.dmg as artifact
- uses: actions/upload-artifact@v1
- with:
- name: Specify_macos_Internal.dmg
- path: packages/internal/Specify_macos_Internal.dmg
-
- - name: Upload Specify_unix_Internal_64.sh as artifact
- uses: actions/upload-artifact@v1
- with:
- name: Specify_unix_Internal_64.sh
- path: packages/internal/Specify_unix_Internal_64.sh
+ path: packages/Specify_macos.dmg
 
  - name: Upload updates.xml as artifact
  uses: actions/upload-artifact@v1
  with:
  name: updates.xml
- path: packages/external/updates.xml
+ path: packages/updates.xml
 
  - name: Release
  uses: softprops/action-gh-release@v1
@@ -130,9 +100,8 @@ jobs:
  draft: true
  prerelease: true
  files: |
- packages/internal/Specify*
- packages/external/Specify*
- packages/external/updates.xml
+ packages/Specify*
+ packages/updates.xml
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/build.xml b/build.xml
@@ -238,50 +238,15 @@
  <copy file="./demo_files/my.cnf" todir="${installer.dir}/demo_files" />
  </target>
 
-
- <target name="package-all" description="Generate install4j packages"
- depends="package-internal, package-external">
- </target>
-
- <target name="package-internal" depends="clean-packages, package-internal-mac, package-internal-nonmac">
- <antcall target="generate-updates-xml">
- <param name="packages.dir" value="${packages.dir}/internal"/>
- <param name="ext-frag" value=""/>
- </antcall>
- </target>
-
- <target name="package-external" depends="clean-packages, package-external-mac, package-external-nonmac">
- <antcall target="generate-updates-xml">
- <param name="packages.dir" value="${packages.dir}/external"/>
- <param name="ext-frag" value="-ext"/>
- </antcall>
+ <target name="package-all" depends="clean-packages, package-mac, package-nonmac">
+ <antcall target="generate-updates-xml" />
  </target>
 
  <target name="clean-packages">
  <delete dir="${packages.dir}" />
  </target>
 
- <target name="package-internal-mac" depends="installer-common, make-jar-mac">
- <package-mac packages.dir="${packages.dir}/internal" ext-frag=""/>
- </target>
-
- <target name="package-external-mac" depends="installer-common, make-jar-mac">
- <package-mac packages.dir="${packages.dir}/external" ext-frag="-ext"/>
- </target>
-
- <target name="package-internal-nonmac" depends="installer-common, make-jar-nonmac">
- <package-winlin packages.dir="${packages.dir}/internal" ext-frag=""/>
- </target>
-
- <target name="package-external-nonmac" depends="installer-common, make-jar-nonmac">
- <package-winlin packages.dir="${packages.dir}/external" ext-frag="-ext"/>
- </target>
-
-
- <macrodef name="package-mac">
- <attribute name="packages.dir"/>
- <attribute name="ext-frag"/>
- <sequential>
+ <target name="package-mac" depends="installer-common, make-jar-mac">
  <delete file="${installer.dir}/non-mac-application-adapter.jar" />
  <copy overwrite="true" file="${build.root}/${jar.name}-mac.jar" tofile="${installer.dir}/${jar.name}.jar" />
 
@@ -296,20 +261,15 @@
  <arg value="macPkcs12File=${mac.pkcs12},windowsPkcs12File=${win.pkcs12}" />
 
  <arg value="--release=${specify.SPECIFY_VERSION}" />
- <arg value="--destination=@{packages.dir}" />
+ <arg value="--destination=${packages.dir}" />
  <arg value="--build-ids=24" />
- <arg value="${packaging.dir}/5-mac-full@{ext-frag}.install4j" />
+ <arg value="${packaging.dir}/5-mac-full-ext.install4j" />
  </exec>
- <move file="@{packages.dir}/updates.xml" tofile="@{packages.dir}/updates.xml.macfull"/>
- </sequential>
- </macrodef>
-
+ <move file="${packages.dir}/updates.xml" tofile="${packages.dir}/updates.xml.macfull"/>
+ </target>
 
 
- <macrodef name="package-winlin">
- <attribute name="packages.dir"/>
- <attribute name="ext-frag"/>
- <sequential>
+ <target name="package-nonmac" depends="installer-common, make-jar-nonmac">
  <copy file="${system.dep.libs.dir}/non-mac-application-adapter.jar" todir="${installer.dir}" />
  <copy overwrite="true" file="${build.root}/${jar.name}-nonmac.jar" tofile="${installer.dir}/${jar.name}.jar" />
 
@@ -324,11 +284,11 @@
  <arg value="macPkcs12File=${mac.pkcs12},windowsPkcs12File=${win.pkcs12}" />
 
  <arg value="--release=${specify.SPECIFY_VERSION}" />
- <arg value="--destination=@{packages.dir}" />
+ <arg value="--destination=${packages.dir}" />
  <arg value="--build-ids=176,179" />
- <arg value="${packaging.dir}/5-winlin-full@{ext-frag}.install4j" />
+ <arg value="${packaging.dir}/5-winlin-full-ext.install4j" />
  </exec>
- <move file="@{packages.dir}/updates.xml" tofile="@{packages.dir}/updates.xml.winlinfull"/>
+ <move file="${packages.dir}/updates.xml" tofile="${packages.dir}/updates.xml.winlinfull"/>
 
  <exec executable="${install4j.dir}/bin/install4jc">
  <!-- <arg value="-\-quiet"/> -->
@@ -341,18 +301,17 @@
  <arg value="macPkcs12File=${mac.pkcs12},windowsPkcs12File=${win.pkcs12}" />
 
  <arg value="--release=${specify.SPECIFY_VERSION}" />
- <arg value="--destination=@{packages.dir}" />
+ <arg value="--destination=${packages.dir}" />
  <arg value="--build-ids=1965,1873" />
- <arg value="${packaging.dir}/5-winlin-full@{ext-frag}-64.install4j" />
+ <arg value="${packaging.dir}/5-winlin-full-ext-64.install4j" />
  </exec>
- <move file="@{packages.dir}/updates.xml" tofile="@{packages.dir}/updates.xml.winlinfull64"/>
+ <move file="${packages.dir}/updates.xml" tofile="${packages.dir}/updates.xml.winlinfull64"/>
 
- <move todir="@{packages.dir}">
- <fileset dir="@{packages.dir}"/>
+ <move todir="${packages.dir}">
+ <fileset dir="${packages.dir}"/>
  <mapper type="regexp" from="^(.*)-x64(.*)$" to="\1\2" />
  </move>
- </sequential>
- </macrodef>
+ </target>
 
 
  <target name="generate-updates-xml">