inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-2463 MNT-17909 Disable win32 installer

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alex Mukha
2017-05-29 18:57:11 +00:00
parent d10216d445
commit e83187ec39
2 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/build-installers.xml
View File

@@ -3,32 +3,12 @@
<target name="build-all"> <target name="build-all">
<!-- Build installers in parallel --> <!-- Build installers in parallel -->
<parallel threadCount="2" failonany="true"> <parallel threadCount="2" failonany="true">
<antcall target="build-win32-installer" unless:set="skipWinInstaller" />
<antcall target="build-win64-installer" unless:set="skipWinInstaller" /> <antcall target="build-win64-installer" unless:set="skipWinInstaller" />
<antcall target="build-linux-installer" unless:set="skipLinInstaller" /> <antcall target="build-linux-installer" unless:set="skipLinInstaller" />
<antcall target="build-osx-installer" unless:set="skipOSXInstaller" /> <antcall target="build-osx-installer" unless:set="skipOSXInstaller" />
</parallel> </parallel>
</target> </target>
<target name="build-win32-installer">
<exec failonerror="true" executable="${bitrock.executable}" dir="${project.build.directory}">
<arg value="build" />
<arg value="classes/bitrock/project.xml" />
<arg value="windows" />
<arg value="--license" />
<arg value="${license.file.location}"/>
<arg value="--setvars" />
<arg line="${bitrock.arguments}" />
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
<arg value="aos_module_distribution_folder=${project.build.directory}/distribution/aos-module" />
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-windows" />
<arg value="local_binaries_folder=${project.build.directory}/binaries-windows" />
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />
<arg value="wcmqs_folder=${project.build.directory}/wcmqs" />
<arg value="project.installerFilename=${alfresco.package.name}-installer-${installer.version.name}-win-x32.exe" />
</exec>
</target>
<target name="build-win64-installer"> <target name="build-win64-installer">
<exec failonerror="true" executable="${bitrock.executable}" dir="${project.build.directory}"> <exec failonerror="true" executable="${bitrock.executable}" dir="${project.build.directory}">
<arg value="build" /> <arg value="build" />

18
src/main/resources/extract-binaries.xml
View File

@@ -13,14 +13,12 @@
<target name="extract-base"> <target name="extract-base">
<extract-base-for targetPlatform="linux" unless:set="skipLinInstaller" /> <extract-base-for targetPlatform="linux" unless:set="skipLinInstaller" />
<extract-base-for targetPlatform="osx" unless:set="skipOSXInstaller" /> <extract-base-for targetPlatform="osx" unless:set="skipOSXInstaller" />
<extract-base-for targetPlatform="win32" unless:set="skipWinInstaller" />
<extract-base-for targetPlatform="win64" unless:set="skipWinInstaller" /> <extract-base-for targetPlatform="win64" unless:set="skipWinInstaller" />
</target> </target>
<target name="extract-platform"> <target name="extract-platform">
<extract-platform-for targetPlatform="linux" unless:set="skipLinInstaller" /> <extract-platform-for targetPlatform="linux" unless:set="skipLinInstaller" />
<extract-platform-for targetPlatform="osx" unless:set="skipOSXInstaller" /> <extract-platform-for targetPlatform="osx" unless:set="skipOSXInstaller" />
<extract-platform-for targetPlatform="win32" unless:set="skipWinInstaller" />
<extract-platform-for targetPlatform="win64" unless:set="skipWinInstaller" /> <extract-platform-for targetPlatform="win64" unless:set="skipWinInstaller" />
</target> </target>
@@ -37,9 +35,6 @@
<condition property="bin.folder" value="${project.build.directory}/binaries-osx-x64"> <condition property="bin.folder" value="${project.build.directory}/binaries-osx-x64">
<equals arg1="@{targetPlatform}" arg2="osx" /> <equals arg1="@{targetPlatform}" arg2="osx" />
</condition> </condition>
<condition property="bin.folder" value="${project.build.directory}/binaries-windows">
<equals arg1="@{targetPlatform}" arg2="win32" />
</condition>
<condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64"> <condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64">
<equals arg1="@{targetPlatform}" arg2="win64" /> <equals arg1="@{targetPlatform}" arg2="win64" />
</condition> </condition>
@@ -59,10 +54,7 @@
<!-- Check if platform is windows --> <!-- Check if platform is windows -->
<local name="isPlatformWindows"/> <local name="isPlatformWindows"/>
<condition property="isPlatformWindows"> <condition property="isPlatformWindows">
<or> <equals arg1="@{targetPlatform}" arg2="win64" />
<equals arg1="@{targetPlatform}" arg2="win32" />
<equals arg1="@{targetPlatform}" arg2="win64" />
</or>
</condition> </condition>
<echo> Extracting Common...</echo> <echo> Extracting Common...</echo>
@@ -106,9 +98,6 @@
<condition property="bin.folder" value="${project.build.directory}/binaries-osx-x64"> <condition property="bin.folder" value="${project.build.directory}/binaries-osx-x64">
<equals arg1="@{targetPlatform}" arg2="osx" /> <equals arg1="@{targetPlatform}" arg2="osx" />
</condition> </condition>
<condition property="bin.folder" value="${project.build.directory}/binaries-windows">
<equals arg1="@{targetPlatform}" arg2="win32" />
</condition>
<condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64"> <condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64">
<equals arg1="@{targetPlatform}" arg2="win64" /> <equals arg1="@{targetPlatform}" arg2="win64" />
</condition> </condition>
@@ -116,10 +105,7 @@
<!-- LibreOffice is the same for win32 and win64 --> <!-- LibreOffice is the same for win32 and win64 -->
<local name="isPlatformWindows"/> <local name="isPlatformWindows"/>
<condition property="isPlatformWindows"> <condition property="isPlatformWindows">
<or> <equals arg1="@{targetPlatform}" arg2="win64" />
<equals arg1="@{targetPlatform}" arg2="win32" />
<equals arg1="@{targetPlatform}" arg2="win64" />
</or>
</condition> </condition>
<local name="libreoffice.platform"/> <local name="libreoffice.platform"/>
<condition property="libreoffice.platform" value="windows" else="@{targetPlatform}"> <condition property="libreoffice.platform" value="windows" else="@{targetPlatform}">