Merged AIR-SPRINT1 (5.1.0) to HEAD (5.1/Cloud)

108200: RA-233 Turn the Full installer into a Platform only installer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2015-07-21 11:00:36 +00:00
parent 6466f317da
commit 01bf33a37c
5 changed files with 37 additions and 74 deletions

83
pom.xml
View File

@@ -6,25 +6,28 @@
<artifactId>alfresco-packaging</artifactId>
<version>5.1-SNAPSHOT</version>
</parent>
<artifactId>alfresco-installer</artifactId>
<artifactId>alfresco-platform-installer</artifactId>
<packaging>jar</packaging>
<name>Alfresco Installers</name>
<name>Alfresco Platform Installers</name>
<properties>
<installer.version>2015-a-EA</installer.version>
<binaries.folder>${user.home}/binaries</binaries.folder>
<bitrock.folder>${project.build.directory}/installbuilder</bitrock.folder>
<signing.key.location>${binaries.folder}/build-classpath/code-signing</signing.key.location>
<license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location>
<bitrock.arguments>
project.outputDirectory=${project.build.directory}
project.version=${installer.version}
project.fullName='Alfresco Community ${installer.version}'
project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12
project.osxSigningPkcs12Password=${p12Password}
project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12
project.windowsSigningPkcs12Password=${p12Password}
alfresco_edition=community
project.outputDirectory=${project.build.directory}
project.version=${project.version}
project.fullName='Alfresco Platform Community'
project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12
project.osxSigningPkcs12Password=${p12Password}
project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12
project.windowsSigningPkcs12Password=${p12Password}
alfresco_edition=community
alfrescogoogledocs_component_enabled=0
alfrescosharepoint_component_enabled=0
alfrescosolr_component_enabled=0
alfrescowcmqs_component_enabled=0
</bitrock.arguments>
<installer.name>alfresco-community</installer.name>
</properties>
@@ -200,67 +203,11 @@
<!-- Distribution -->
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-distribution</artifactId>
<artifactId>alfresco-platform-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution</outputDirectory>
</artifactItem>
<!-- WCMQS Distribution -->
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/wcmqs</outputDirectory>
</artifactItem>
<!-- WCMQS War Config file -->
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-web</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
<outputDirectory>${project.build.directory}/wcmqs</outputDirectory>
<includes>alfresco/web-extension/**</includes>
</artifactItem>
<!-- WCMQS Client Config file -->
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-client-api</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/wcmqs</outputDirectory>
<includes>alfresco/extension/**</includes>
</artifactItem>
<!-- Solr1 Distribution -->
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr1-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution/alfresco-community-${project.version}/alf_data/solr</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>get-amps</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco.integrations</groupId>
<artifactId>alfresco-googledocs-repo</artifactId>
<version>${alfresco.googledocs.version}</version>
<type>amp</type>
</artifactItem>
<artifactItem>
<groupId>org.alfresco.integrations</groupId>
<artifactId>alfresco-googledocs-share</artifactId>
<version>${alfresco.googledocs.version}</version>
<type>amp</type>
</artifactItem>
</artifactItems>
</configuration>
</execution>

View File

@@ -5,6 +5,13 @@
<canBeEdited>1</canBeEdited>
<selected>1</selected>
<show>1</show>
<shouldPackRuleList>
<isTrue value="${alfrescogoogledocs_component_enabled}" />
</shouldPackRuleList>
<parameterList>
<booleanParameter name="alfrescogoogledocs_component_enabled" ask="0" value="1" />
</parameterList>
<folderList>
<folder>

View File

@@ -4,6 +4,13 @@
<canBeEdited>1</canBeEdited>
<selected>0</selected>
<show>1</show>
<shouldPackRuleList>
<isTrue value="${alfrescosolr_component_enabled}" />
</shouldPackRuleList>
<parameterList>
<booleanParameter name="alfrescosolr_component_enabled" ask="0" value="1" />
</parameterList>
<folderList>
<folder>
<name>solr</name>

View File

@@ -5,8 +5,12 @@
<canBeEdited>1</canBeEdited>
<selected>0</selected>
<show>1</show>
<shouldPackRuleList>
<isTrue value="${alfrescowcmqs_component_enabled}" />
</shouldPackRuleList>
<parameterList>
<booleanParameter name="alfrescowcmqs_component_enabled" ask="0" value="1" />
</parameterList>
<folderList>

View File

@@ -29,21 +29,19 @@
</sequential>
</macrodef>
<property name="installer.name" value="alfresco-community" />
<target name="all" depends="sign, package-osx, delete-binaries"/>
<target name="sign">
<sign-installer file="${project.build.directory}/${installer.name}-${project.version}-installer-win-x32.exe"/>
<sign-installer file="${project.build.directory}/${installer.name}-${project.version}-installer-win-x64.exe"/>
<sign-installer file="${project.build.directory}/${alfresco.package.name}-${project.version}-installer-win-x32.exe"/>
<sign-installer file="${project.build.directory}/${alfresco.package.name}-${project.version}-installer-win-x64.exe"/>
</target>
<target name="package-osx">
<!-- package OSX installer -->
<tar destfile="${project.build.directory}/${installer.name}-${project.version}-installer-osx-x64.app.tar.gz"
<tar destfile="${project.build.directory}/${alfresco.package.name}-${project.version}-installer-osx-x64.app.tar.gz"
compression="gzip" longfile="gnu">
<tarfileset dir="${project.build.directory}" mode="755">
<include name="${installer.name}-${project.version}-installer-osx-x64.app/" />
<include name="${alfresco.package.name}-${project.version}-installer-osx-x64.app/" />
</tarfileset>
</tar>
</target>