diff options
| author | Roberto E. Escobar | 2012-06-13 22:05:21 +0000 |
|---|---|---|
| committer | Roberto E. Escobar | 2012-06-13 22:05:21 +0000 |
| commit | bebdf600116e16bbdc52433ed8a651c77e607b48 (patch) | |
| tree | e8a4df004b0765d158eeb7cc7b74bb0b112fe57e /plugins | |
| parent | 407270989f80bb66ce3ce450eeb1fa436376a448 (diff) | |
| download | org.eclipse.osee-bebdf600116e16bbdc52433ed8a651c77e607b48.tar.gz org.eclipse.osee-bebdf600116e16bbdc52433ed8a651c77e607b48.tar.xz org.eclipse.osee-bebdf600116e16bbdc52433ed8a651c77e607b48.zip | |
feature[ats_VFBFB]: Build OSEE IDE for macosx
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.osee.client.all.parent/pom.xml | 18 | ||||
| -rw-r--r-- | plugins/org.eclipse.osee.client.all.product/customize-product.xml | 20 |
2 files changed, 32 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.client.all.parent/pom.xml b/plugins/org.eclipse.osee.client.all.parent/pom.xml index 3e24d0a3a26..34353e1048f 100644 --- a/plugins/org.eclipse.osee.client.all.parent/pom.xml +++ b/plugins/org.eclipse.osee.client.all.parent/pom.xml @@ -122,10 +122,15 @@ <format>'v'yyyyMMddHHmm'${build-alias}'</format> <archiveSite>true</archiveSite> <environments> - <!-- <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> - </environment> <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch> + <!-- <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch> + </environment> <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> </environment> --> <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> + <environment> <os>win32</os> <ws>win32</ws> <arch>x86_64</arch> @@ -155,10 +160,15 @@ <configuration> <resolver>p2</resolver> <environments> - <!-- <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> - </environment> <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch> + <!-- <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch> + </environment> <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> </environment> --> <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> + <environment> <os>win32</os> <ws>win32</ws> <arch>x86_64</arch> diff --git a/plugins/org.eclipse.osee.client.all.product/customize-product.xml b/plugins/org.eclipse.osee.client.all.product/customize-product.xml index 0340fe17fcc..666b553a286 100644 --- a/plugins/org.eclipse.osee.client.all.product/customize-product.xml +++ b/plugins/org.eclipse.osee.client.all.product/customize-product.xml @@ -20,6 +20,7 @@ <updateProduct os="linux" ws="gtk" arch="x86" jreVersion="1.6.0_26" /> <updateProduct os="linux" ws="gtk" arch="x86_64" jreVersion="1.6.0_30" /> <!--<updateProduct os="solaris" ws="gtk" arch="sparc" jreVersion="1.6.0_24" /> --> + <updateProduct os="macosx" ws="cocoa" arch="x86_64" jreVersion="_" /> </target> <!-- *************************************************************** --> @@ -36,9 +37,16 @@ <var name="productPluginPath" value="${productPath}/plugins" /> <!-- Add JRE + <if> + <equals arg1="@{os}" arg2="macosx" /> + <then> + </then> + <else> <var name="jreResource" value="${resources-directory}/../jres/jre_@{jreVersion}_@{os}_@{arch}.zip" /> <unzip src="${jreResource}" dest="${productPath}" /> <chmod perm="ugo+x" dir="${productPath}/jre" includes="**/*" /> + </else> + </if> --> <!-- Update Configuration Area --> @@ -51,7 +59,15 @@ <customizeConfigIni configpath="${productConfigPath}" pluginspath="${productPluginPath}" configarch="@{arch}" /> <!-- Extra Launches --> - <generateExecutable os="@{os}" productDir="${productPath}" execName="oseeDebug" eclipseArgs="-console${line.separator}-consoleLog" extravmargs="-Xms256m${line.separator}-Xmx700m${line.separator}-Xdebug${line.separator}-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9009" additionalVmArgs="-Dosee.default.broker.uri=<BROKER_ADDRESS>${line.separator}-Dosee.application.server=http://localhost:8089${line.separator}-Dosee.authentication.protocol=demo${line.separator}${additionalExecIniArgs}" /> + <if> + <equals arg1="@{os}" arg2="macosx" /> + <then> + <!-- NO DEBUG EXEC for MACOSX --> + </then> + <else> + <generateExecutable os="@{os}" productDir="${productPath}" execName="oseeDebug" eclipseArgs="-console${line.separator}-consoleLog" extravmargs="-Xms256m${line.separator}-Xmx700m${line.separator}-Xdebug${line.separator}-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9009" additionalVmArgs="-Dosee.default.broker.uri=<BROKER_ADDRESS>${line.separator}-Dosee.application.server=http://localhost:8089${line.separator}-Dosee.authentication.protocol=demo${line.separator}${additionalExecIniArgs}" /> + </else> + </if> <!-- Copy Icon if Win32 --> <if> @@ -109,7 +125,7 @@ <replaceregexp file="@{configPath}/config.ini" match="osgi.instance.area.default=(.*)" replace="" /> <replaceregexp file="@{configPath}/config.ini" match="eclipse.p2.data.area=(.*)" replace="" /> - + <echo file="@{configPath}/config.ini" append="true" message="osgi.instance.area.default=@user.home/${defaultWorkspaceName}/${line.separator}" /> <echo file="@{configPath}/config.ini" append="true" message="osgi.configuration.area=@user.home/.eclipse/osee_@{configarch}_${osee.core.version}${line.separator}" /> <echo file="@{configPath}/config.ini" append="true" message="eclipse.p2.data.area=@config.dir/p2/${line.separator}" /> |