diff options
| author | Roberto E. Escobar | 2012-04-19 23:18:22 +0000 |
|---|---|---|
| committer | Roberto E. Escobar | 2012-04-19 23:18:22 +0000 |
| commit | be6686db68f585c3b2e04bf182ca704390dbbb2b (patch) | |
| tree | dad7fb1c318cf26d80c8c1cac2748aacc651c4c0 /plugins | |
| parent | 2bf088bfa4a3b2fb778bc5e9f7de399340796379 (diff) | |
| download | org.eclipse.osee-be6686db68f585c3b2e04bf182ca704390dbbb2b.tar.gz org.eclipse.osee-be6686db68f585c3b2e04bf182ca704390dbbb2b.tar.xz org.eclipse.osee-be6686db68f585c3b2e04bf182ca704390dbbb2b.zip | |
feature[ats_0ZVNB]: Add default workspace to OSEE IDE all-in-one
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.osee.client.all.product/customize-product.xml | 11 |
1 files changed, 7 insertions, 4 deletions
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 a51f122880e..0340fe17fcc 100644 --- a/plugins/org.eclipse.osee.client.all.product/customize-product.xml +++ b/plugins/org.eclipse.osee.client.all.product/customize-product.xml @@ -45,10 +45,10 @@ <delete dir="${productConfigPath}/.settings" failonerror="false" quiet="true" /> <delete dir="${productConfigPath}/org.eclipse.update" failonerror="false" quiet="true" /> <mkdir dir="${productConfigPath}/.settings" /> - <copy file="${resources-directory}/org.eclipse.core.net.prefs" tofile="${productConfigPath}/.settings/org.eclipse.core.net.prefs" overwrite="true" /> + <!--<copy file="${resources-directory}/org.eclipse.core.net.prefs" tofile="${productConfigPath}/.settings/org.eclipse.core.net.prefs" overwrite="true" />--> <!-- Update Configuration INI --> - <customizeConfigIni configpath="${productConfigPath}" pluginspath="${productPluginPath}" /> + <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}" /> @@ -93,6 +93,7 @@ <macrodef name="customizeConfigIni"> <attribute name="configPath" /> <attribute name="pluginsPath" /> + <attribute name="configarch" /> <sequential> <pathconvert property="osee.framework.core.bundle.path" setonempty="false"> <path> @@ -106,9 +107,11 @@ <echo file="${products-directory}/build_label.txt" append="false">${osee.core.version}</echo> - <replaceregexp file="@{configPath}/config.ini" match="osgi.instance.area.default=(.*)" replace="osgi.instance.area.default=@user.home/${defaultWorkspaceName}" /> + <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.configuration.area=@user.home/.eclipse/osee.platform_${osee.core.version}${line.separator}" /> + + <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}" /> </sequential> </macrodef> |