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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
107974: BDE-376: Upgrade Bitrock Installbuilder to 15.1.0
   - Installbuilder is now on Nexus instead of BINARIES
   - OSX app is now signed on Linux build agents
   - OSX app is now bundled in a DMG instead of a tar.gz archive


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-07-09 15:59:15 +00:00
parent 239a55d9d2
commit 96dcebe7c9
1 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
pom.xml
View File

@@ -13,7 +13,7 @@
<properties> <properties>
<installer.version>2015-1-EA</installer.version> <installer.version>2015-1-EA</installer.version>
<binaries.folder>${user.home}/binaries</binaries.folder> <binaries.folder>${user.home}/binaries</binaries.folder>
<bitrock.folder>${binaries.folder}/bitrock/bitrock-9.5.1</bitrock.folder> <bitrock.folder>${project.build.directory}/installbuilder</bitrock.folder>
<signing.key.location>${binaries.folder}/build-classpath/alfresco-code-sign</signing.key.location> <signing.key.location>${binaries.folder}/build-classpath/alfresco-code-sign</signing.key.location>
<bitrock.arguments> <bitrock.arguments>
--license --license
@@ -22,12 +22,17 @@
project.outputDirectory=${project.build.directory} project.outputDirectory=${project.build.directory}
project.version=${installer.version} project.version=${installer.version}
project.fullName='Alfresco One ${installer.version}' project.fullName='Alfresco One ${installer.version}'
project.osxSigningPkcs12File=${binaries.folder}/build-classpath/code-signing/Alfresco-Software-Ltd-osx.p12
project.osxSigningPkcs12Password=${p12Password}
project.windowsSigningPkcs12File=${binaries.folder}/build-classpath/code-signing/Alfresco-Software-Ltd.p12
project.windowsSigningPkcs12Password=${p12Password}
alfresco_edition=enterprise alfresco_edition=enterprise
distribution_folder=${project.build.directory}/distribution/alfresco-enterprise-${project.version} distribution_folder=${project.build.directory}/distribution/alfresco-enterprise-${project.version}
wcmqs_folder=${project.build.directory}/wcmqs wcmqs_folder=${project.build.directory}/wcmqs
alfresco_amps_source_directory=${project.build.directory}/dependency alfresco_amps_source_directory=${project.build.directory}/dependency
alfrescosharepoint_component_enabled=0 alfrescosharepoint_component_enabled=0
</bitrock.arguments> </bitrock.arguments>
<installer.name>alfresco-enterprise</installer.name>
</properties> </properties>
<dependencies> <dependencies>
@@ -195,7 +200,7 @@
${bitrock.arguments} ${bitrock.arguments}
binaries_folder=${binaries.folder}/bitrock/binaries-windows binaries_folder=${binaries.folder}/bitrock/binaries-windows
local_binaries_folder=${project.build.directory}/binaries-windows local_binaries_folder=${project.build.directory}/binaries-windows
project.installerFilename=alfresco-enterprise-${project.version}-installer-win-x32.exe project.installerFilename=${installer.name}-${project.version}-installer-win-x32.exe
</commandlineArgs> </commandlineArgs>
</configuration> </configuration>
</execution> </execution>
@@ -215,7 +220,7 @@
${bitrock.arguments} ${bitrock.arguments}
binaries_folder=${binaries.folder}/bitrock/binaries-windows-x64 binaries_folder=${binaries.folder}/bitrock/binaries-windows-x64
local_binaries_folder=${project.build.directory}/binaries-windows-x64 local_binaries_folder=${project.build.directory}/binaries-windows-x64
project.installerFilename=alfresco-enterprise-${project.version}-installer-win-x64.exe project.installerFilename=${installer.name}-${project.version}-installer-win-x64.exe
</commandlineArgs> </commandlineArgs>
</configuration> </configuration>
</execution> </execution>
@@ -235,7 +240,7 @@
${bitrock.arguments} ${bitrock.arguments}
binaries_folder=${binaries.folder}/bitrock/binaries-linux-x64 binaries_folder=${binaries.folder}/bitrock/binaries-linux-x64
local_binaries_folder=${project.build.directory}/binaries-linux-x64 local_binaries_folder=${project.build.directory}/binaries-linux-x64
project.installerFilename=alfresco-enterprise-${project.version}-installer-linux-x64.bin project.installerFilename=${installer.name}-${project.version}-installer-linux-x64.bin
</commandlineArgs> </commandlineArgs>
</configuration> </configuration>
</execution> </execution>
@@ -255,7 +260,7 @@
${bitrock.arguments} ${bitrock.arguments}
binaries_folder=${binaries.folder}/bitrock/binaries-osx-x64 binaries_folder=${binaries.folder}/bitrock/binaries-osx-x64
local_binaries_folder=${project.build.directory}/binaries-osx-x64 local_binaries_folder=${project.build.directory}/binaries-osx-x64
project.installerFilename=alfresco-enterprise-${project.version}-installer-osx-x64.app project.installerFilename=${installer.name}-${project.version}-installer-osx-x64.app
</commandlineArgs> </commandlineArgs>
</configuration> </configuration>
</execution> </execution>
@@ -274,7 +279,7 @@
</os> </os>
</activation> </activation>
<properties> <properties>
<bitrock.executable>${bitrock.folder}/win/bin/builder-cli.exe</bitrock.executable> <bitrock.executable>${bitrock.folder}/bin/builder-cli.exe</bitrock.executable>
</properties> </properties>
</profile> </profile>
<profile> <profile>
@@ -285,42 +290,19 @@
</os> </os>
</activation> </activation>
<properties> <properties>
<bitrock.executable>${bitrock.folder}/linux/bin/builder</bitrock.executable> <bitrock.executable>${bitrock.folder}/bin/builder</bitrock.executable>
</properties> </properties>
</profile> </profile>
<!-- Signing Windows installers -->
<profile> <profile>
<id>sign</id> <id>osx-bitrock</id>
<activation> <activation>
<file> <os>
<exists>${user.home}/binaries/build-classpath/alfresco-code-sign.der</exists> <family>mac</family>
</file> </os>
</activation> </activation>
<build> <properties>
<plugins> <bitrock.executable>${bitrock.folder}/bin/builder</bitrock.executable>
<plugin> </properties>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>sign-windows-installers</id>
<phase>verify</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<skip>${skipWinInstaller}</skip>
<target>
<ant antfile="${project.build.directory}/sign.xml">
<property name="installer.name" value="alfresco-enterprise" />
</ant>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>