* added silent setup support, run setup without x11

This commit is contained in:
Heng Sin Low 2007-01-14 18:47:53 +00:00
parent ea13e0b36a
commit b652ec819e
4 changed files with 22 additions and 8 deletions

View File

@ -14,7 +14,7 @@
dir %ADEMPIERE_INSTALL% dir %ADEMPIERE_INSTALL%
@Echo Done ... @Echo Done ...
@sleep 60 @Pause
@exit @exit
:NOBUILD :NOBUILD

View File

@ -26,7 +26,7 @@ dir %ADEMPIERE_INSTALL%
@Echo Starting Apps Server ... @Echo Starting Apps Server ...
@Start %ADEMPIERE_HOME%\utils\RUN_Server2.bat @Start %ADEMPIERE_HOME%\utils\RUN_Server2.bat
@Sleep 10 @Pause
@Exit @Exit
:NOBUILD :NOBUILD

View File

@ -7,7 +7,7 @@
@echo Cleanup ... @echo Cleanup ...
@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.Main clean @"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.Main clean
@sleep 60 @Pause
@exit @exit
:NOBUILD :NOBUILD
@Echo Check myDevEnv.bat (copy from myDevEnvTemplate.bat) @Echo Check myDevEnv.bat (copy from myDevEnvTemplate.bat)

View File

@ -64,11 +64,11 @@
dest="${env.ADEMPIERE_ROOT}" dest="${env.ADEMPIERE_ROOT}"
overwrite="yes"/> overwrite="yes"/>
<!-- Run Setup --> <!-- Run Setup -->
<!-- <input addproperty="runSetupInput"
<ant inheritAll="false" dir="${env.ADEMPIERE_HOME}" target="setup"/> message="Run Setup(Y/N) ? "
--> validargs="Y,y,N,n"/>
<antcall target="runSetupWin"></antcall>
<antcall target="runSetupNonWin"></antcall> <antcall target="runSetup"/>
</target> </target>
<!-- ================================================ --> <!-- ================================================ -->
@ -105,6 +105,20 @@
spawn="false" resolveexecutable="true"> spawn="false" resolveexecutable="true">
</exec> </exec>
</target> </target>
<target name="runSetupCheck">
<condition property="setup.yes">
<or>
<equals arg1="y" arg2="${runSetupInput}"/>
<equals arg1="Y" arg2="${runSetupInput}"/>
</or>
</condition>
</target>
<target name="runSetup" depends="runSetupCheck" if="setup.yes">
<antcall target="runSetupWin"></antcall>
<antcall target="runSetupNonWin"></antcall>
</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"