modify build for osgi base deployment.
This commit is contained in:
parent
f100d9b4bc
commit
9574a82506
|
@ -6,5 +6,4 @@ env.ADEMPIERE_VERSION=ADempiere
|
||||||
env.ADEMPIERE_VERSION_FILE=400pr01
|
env.ADEMPIERE_VERSION_FILE=400pr01
|
||||||
env.ADEMPIERE_VENDOR=ADempiere
|
env.ADEMPIERE_VENDOR=ADempiere
|
||||||
env.ENCODING=UTF-8
|
env.ENCODING=UTF-8
|
||||||
env.XDOCLET_HOME=${env.ADEMPIERE_SOURCE}/tools
|
|
||||||
env.ADEMPIERE_ENV=Y
|
env.ADEMPIERE_ENV=Y
|
||||||
|
|
|
@ -15,6 +15,11 @@
|
||||||
<echo message="=========== Build Adempiere - ${env.ENCODING}"/>
|
<echo message="=========== Build Adempiere - ${env.ENCODING}"/>
|
||||||
<!-- Create the time stamp -->
|
<!-- Create the time stamp -->
|
||||||
<tstamp/>
|
<tstamp/>
|
||||||
|
<delete>
|
||||||
|
<fileset dir="lib/plugins">
|
||||||
|
<include name="*.jar"/>
|
||||||
|
</fileset>
|
||||||
|
</delete>
|
||||||
</target>
|
</target>
|
||||||
<target name="jar" depends="init">
|
<target name="jar" depends="init">
|
||||||
<ant inheritAll="false" dir="tools"/>
|
<ant inheritAll="false" dir="tools"/>
|
||||||
|
@ -22,32 +27,25 @@
|
||||||
<ant inheritAll="false" dir="extend"/>
|
<ant inheritAll="false" dir="extend"/>
|
||||||
<ant inheritAll="false" dir="client"/>
|
<ant inheritAll="false" dir="client"/>
|
||||||
<ant inheritAll="false" dir="JasperReports"/>
|
<ant inheritAll="false" dir="JasperReports"/>
|
||||||
<ant inheritAll="false" dir="JasperReportsWebApp"/>
|
<ant inheritAll="false" dir="JasperReportsTools"/>
|
||||||
<ant inheritAll="false" dir="serverRoot"/>
|
<ant inheritAll="false" dir="serverRoot"/>
|
||||||
<ant inheritAll="false" dir="serverApps"/>
|
<ant inheritAll="false" dir="serverApps"/>
|
||||||
<ant inheritAll="false" dir="webStore"/>
|
<ant inheritAll="false" dir="webStore"/>
|
||||||
<ant inheritAll="false" dir="webCM"/>
|
|
||||||
<ant inheritAll="false" dir="sqlj"/>
|
|
||||||
<ant inheritAll="false" dir="posterita/posterita"/>
|
|
||||||
<ant inheritAll="false" dir="zkwebui"/>
|
<ant inheritAll="false" dir="zkwebui"/>
|
||||||
</target>
|
</target>
|
||||||
<target name="build" depends="plugins">
|
<target name="build" depends="jar">
|
||||||
<ant inheritAll="false" dir="install"/>
|
<ant inheritAll="false" dir="install"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
<ant inheritAll="false" dir="tools" target="clean"/>
|
<ant inheritAll="false" dir="tools" target="clean"/>
|
||||||
<ant inheritAll="false" dir="base" target="clean"/>
|
<ant inheritAll="false" dir="base" target="clean"/>
|
||||||
<ant inheritAll="false" dir="extend" target="clean"/>
|
<ant inheritAll="false" dir="extend" target="clean"/>
|
||||||
<ant inheritAll="false" dir="JasperReports" target="clean"/>
|
<ant inheritAll="false" dir="JasperReports" target="clean"/>
|
||||||
<ant inheritAll="false" dir="JasperReportsWebApp" target="clean"/>
|
|
||||||
<ant inheritAll="false" dir="client" target="clean"/>
|
<ant inheritAll="false" dir="client" target="clean"/>
|
||||||
<ant inheritAll="false" dir="serverRoot" target="clean"/>
|
<ant inheritAll="false" dir="serverRoot" target="clean"/>
|
||||||
<ant inheritAll="false" dir="serverApps" target="clean"/>
|
<ant inheritAll="false" dir="serverApps" target="clean"/>
|
||||||
<ant inheritAll="false" dir="webStore" target="clean"/>
|
<ant inheritAll="false" dir="webStore" target="clean"/>
|
||||||
<ant inheritAll="false" dir="webCM" target="clean"/>
|
|
||||||
<ant inheritAll="false" dir="sqlj" target="clean"/>
|
|
||||||
<ant inheritAll="false" dir="posterita/posterita" target="clean"/>
|
|
||||||
<ant inheritAll="false" dir="install" target="clean"/>
|
<ant inheritAll="false" dir="install" target="clean"/>
|
||||||
<ant inheritAll="false" dir="zkwebui" target="clean"/>
|
<ant inheritAll="false" dir="zkwebui" target="clean"/>
|
||||||
</target>
|
</target>
|
||||||
|
@ -61,11 +59,11 @@
|
||||||
<ant inheritAll="false" dir="extend" target="compile"/>
|
<ant inheritAll="false" dir="extend" target="compile"/>
|
||||||
<ant inheritAll="false" dir="client"/>
|
<ant inheritAll="false" dir="client"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="update-serverRoot" depends="init">
|
<target name="update-serverRoot" depends="init">
|
||||||
<ant inheritAll="false" dir="serverRoot"/>
|
<ant inheritAll="false" dir="serverRoot"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
<!-- Adempiere Local Install -->
|
<!-- Adempiere Local Install -->
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
|
@ -80,38 +78,22 @@
|
||||||
<fileset dir="${env.ADEMPIERE_HOME}/jboss"/>
|
<fileset dir="${env.ADEMPIERE_HOME}/jboss"/>
|
||||||
</delete>
|
</delete>
|
||||||
<!-- Unzip Install File -->
|
<!-- Unzip Install File -->
|
||||||
<unzip src="install/build/Adempiere_${env.ADEMPIERE_VERSION_FILE}.zip"
|
<unzip src="install/build/Adempiere_${env.ADEMPIERE_VERSION_FILE}.zip"
|
||||||
dest="${env.ADEMPIERE_ROOT}"
|
dest="${env.ADEMPIERE_ROOT}"
|
||||||
overwrite="yes"/>
|
overwrite="yes"/>
|
||||||
<!-- Run Setup -->
|
<!-- Run Setup -->
|
||||||
<!--
|
<!--
|
||||||
<input addproperty="runSetupInput"
|
<input addproperty="runSetupInput"
|
||||||
message="Run Setup(Y/N) ? "
|
message="Run Setup(Y/N) ? "
|
||||||
validargs="Y,y,N,n"/>
|
validargs="Y,y,N,n"/>
|
||||||
|
|
||||||
<antcall target="runSetup"/>
|
<antcall target="runSetup"/>
|
||||||
-->
|
-->
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
<!-- Adempiere OSGi Update -->
|
<!-- Adempiere OSGi Update -->
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
<target name="plugin">
|
|
||||||
<buildPlugin workspaceDirectory=".."
|
|
||||||
projectName="${plugin}"
|
|
||||||
targetPlatformId="target.platform"
|
|
||||||
destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
|
|
||||||
buildSourceJar="false"
|
|
||||||
clean="no"/>
|
|
||||||
<!-- TODO make this faster -->
|
|
||||||
<buildPlugin workspaceDirectory=".."
|
|
||||||
projectName="${plugin}"
|
|
||||||
targetPlatformId="target.platform"
|
|
||||||
destination="${env.ADEMPIERE_ROOT}/Adempiere/webapp/bridge/WEB-INF/eclipse"
|
|
||||||
buildSourceJar="false"
|
|
||||||
clean="no"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="plugins">
|
<target name="plugins">
|
||||||
<ant4eclipse:executeProjectSet workspaceDirectory=".." allWorkspaceProjects="true">
|
<ant4eclipse:executeProjectSet workspaceDirectory=".." allWorkspaceProjects="true">
|
||||||
<ant4eclipse:forEachProject filter="(executeProjectSet.org.eclipse.pde.PluginNature=*)">
|
<ant4eclipse:forEachProject filter="(executeProjectSet.org.eclipse.pde.PluginNature=*)">
|
||||||
|
@ -125,7 +107,7 @@
|
||||||
</ant4eclipse:executeProjectSet>
|
</ant4eclipse:executeProjectSet>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
<!-- Adempiere Local Update -->
|
<!-- Adempiere Local Update -->
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
|
@ -135,33 +117,33 @@
|
||||||
<fileset dir="install/build" includes="Adempiere_*"/>
|
<fileset dir="install/build" includes="Adempiere_*"/>
|
||||||
</copy>
|
</copy>
|
||||||
<!-- Unzip Install File -->
|
<!-- Unzip Install File -->
|
||||||
<unzip src="install/build/Adempiere_${env.ADEMPIERE_VERSION_FILE}.zip"
|
<unzip src="install/build/Adempiere_${env.ADEMPIERE_VERSION_FILE}.zip"
|
||||||
dest="${env.ADEMPIERE_ROOT}"
|
dest="${env.ADEMPIERE_ROOT}"
|
||||||
overwrite="yes"/>
|
overwrite="yes"/>
|
||||||
<!-- Run Setup -->
|
<!-- Run Setup -->
|
||||||
<antcall target="runUpdateWin"></antcall>
|
<antcall target="runUpdateWin"></antcall>
|
||||||
<antcall target="runUpdateNonWin"></antcall>
|
<antcall target="runUpdateNonWin"></antcall>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="runSetupInit">
|
<target name="runSetupInit">
|
||||||
<condition property="isWindows">
|
<condition property="isWindows">
|
||||||
<os family="windows" />
|
<os family="windows" />
|
||||||
</condition>
|
</condition>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="runSetupWin" depends="runSetupInit" if="isWindows" >
|
<target name="runSetupWin" depends="runSetupInit" if="isWindows" >
|
||||||
<exec dir="${env.ADEMPIERE_HOME}" executable="RUN_setup.bat"
|
<exec dir="${env.ADEMPIERE_HOME}" executable="RUN_setup.bat"
|
||||||
spawn="false" resolveexecutable="true">
|
spawn="false" resolveexecutable="true">
|
||||||
</exec>
|
</exec>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="runSetupNonWin" depends="runSetupInit" unless="isWindows" >
|
<target name="runSetupNonWin" depends="runSetupInit" unless="isWindows" >
|
||||||
<chmod dir="${env.ADEMPIERE_HOME}" perm="ugo+rx" includes="RUN_setup.sh"/>
|
<chmod dir="${env.ADEMPIERE_HOME}" perm="ugo+rx" includes="RUN_setup.sh"/>
|
||||||
<exec dir="${env.ADEMPIERE_HOME}" executable="RUN_setup.sh"
|
<exec dir="${env.ADEMPIERE_HOME}" executable="RUN_setup.sh"
|
||||||
spawn="false" resolveexecutable="true">
|
spawn="false" resolveexecutable="true">
|
||||||
</exec>
|
</exec>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="runSetupCheck">
|
<target name="runSetupCheck">
|
||||||
<condition property="setup.yes">
|
<condition property="setup.yes">
|
||||||
<or>
|
<or>
|
||||||
|
@ -170,21 +152,21 @@
|
||||||
</or>
|
</or>
|
||||||
</condition>
|
</condition>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="runSetup" depends="runSetupCheck" if="setup.yes">
|
<target name="runSetup" depends="runSetupCheck" if="setup.yes">
|
||||||
<antcall target="runSetupWin"></antcall>
|
<antcall target="runSetupWin"></antcall>
|
||||||
<antcall target="runSetupNonWin"></antcall>
|
<antcall target="runSetupNonWin"></antcall>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="runUpdateWin" depends="runSetupInit" if="isWindows" >
|
<target name="runUpdateWin" depends="runSetupInit" if="isWindows" >
|
||||||
<exec dir="${env.ADEMPIERE_HOME}" executable="RUN_update.bat"
|
<exec dir="${env.ADEMPIERE_HOME}" executable="RUN_update.bat"
|
||||||
spawn="false" resolveexecutable="true">
|
spawn="false" resolveexecutable="true">
|
||||||
</exec>
|
</exec>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="runUpdateNonWin" depends="runSetupInit" unless="isWindows" >
|
<target name="runUpdateNonWin" depends="runSetupInit" unless="isWindows" >
|
||||||
<chmod dir="${env.ADEMPIERE_HOME}" perm="ugo+rx" includes="RUN_update.sh"/>
|
<chmod dir="${env.ADEMPIERE_HOME}" perm="ugo+rx" includes="RUN_update.sh"/>
|
||||||
<exec dir="${env.ADEMPIERE_HOME}" executable="RUN_update.sh"
|
<exec dir="${env.ADEMPIERE_HOME}" executable="RUN_update.sh"
|
||||||
spawn="false" resolveexecutable="true">
|
spawn="false" resolveexecutable="true">
|
||||||
</exec>
|
</exec>
|
||||||
</target>
|
</target>
|
||||||
|
@ -194,7 +176,7 @@
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
<target name="complete" depends="build, install">
|
<target name="complete" depends="build, install">
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
<!-- update -->
|
<!-- update -->
|
||||||
<!-- ================================================ -->
|
<!-- ================================================ -->
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
<dirname property="adempiere.base" file="${ant.file.properties}/.."/>
|
<dirname property="adempiere.base" file="${ant.file.properties}/.."/>
|
||||||
<property file="${user.home}/.adempiere.properties"/>
|
<property file="${user.home}/.adempiere.properties"/>
|
||||||
<property file="${adempiere.base}/utils_dev/mybuild.properties"/>
|
|
||||||
<property file="${adempiere.base}/utils_dev/build.properties"/>
|
<property file="${adempiere.base}/utils_dev/build.properties"/>
|
||||||
|
<property file="${adempiere.base}/utils_dev/mybuild.properties"/>
|
||||||
|
|
||||||
<!-- Here we could add most common buildpaths -->
|
<!-- Here we could add most common buildpaths -->
|
||||||
|
|
||||||
|
@ -32,8 +32,6 @@
|
||||||
|
|
||||||
<ant4eclipse:targetPlatform id="target.platform">
|
<ant4eclipse:targetPlatform id="target.platform">
|
||||||
<location dir="${workspace}/equinox-target/plugins" />
|
<location dir="${workspace}/equinox-target/plugins" />
|
||||||
<location dir="${workspace}/equinox-target/webapp/plugins" />
|
|
||||||
<location dir="${workspace}/equinox-target/jetty/plugins" />
|
|
||||||
<location dir="${workspace}/equinox-target/spring/plugins" />
|
<location dir="${workspace}/equinox-target/spring/plugins" />
|
||||||
</ant4eclipse:targetPlatform>
|
</ant4eclipse:targetPlatform>
|
||||||
</project>
|
</project>
|
||||||
|
|
Loading…
Reference in New Issue