IDEMPIERE-5877 Include .sh scripts in windows installer (#2044)
* IDEMPIERE-5877 Include .sh scripts in windows installer * - adapt build.xml for windows running with git bash - adapt getVar.sh for windows - as there is no .idpass in windows
This commit is contained in:
Carlos Ruiz
GitHub
parent
5506aa7ae4
commit
64b9415ded
|
|
@ -22,11 +22,11 @@ root.macosx.cocoa.x86_64=file:setup.sh,file:console-setup.sh,file:silent-setup.s
|
|||
root.macosx.cocoa.x86_64.folder.utils=utils.unix
|
||||
root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
|
||||
#windows
|
||||
root.win32.win32.x86=file:setup.bat,file:console-setup.bat,file:silent-setup.bat,file:idempiere-server.bat,file:setup-alt.bat,file:console-setup-alt.bat,file:silent-setup-alt.bat,file:sign-database-build.bat,file:sign-database-build-alt.bat,file:idempiereEnvTemplate.properties,file:../Credits.html,file:../org.idempiere.equinox.p2.director-feature/director.bat,file:../org.idempiere.equinox.p2.director-feature/update.bat,file:../org.idempiere.equinox.p2.director-feature/update-prd.bat
|
||||
root.win32.win32.x86.folder.utils=utils.windows
|
||||
root.win32.win32.x86=file:setup.bat,file:console-setup.bat,file:silent-setup.bat,file:idempiere-server.bat,file:setup-alt.bat,file:console-setup-alt.bat,file:silent-setup-alt.bat,file:sign-database-build.bat,file:sign-database-build-alt.bat,file:idempiereEnvTemplate.properties,file:../Credits.html,file:../org.idempiere.equinox.p2.director-feature/director.bat,file:../org.idempiere.equinox.p2.director-feature/update.bat,file:../org.idempiere.equinox.p2.director-feature/update-prd.bat,file:setup.sh,file:console-setup.sh,file:silent-setup.sh,file:idempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh,file:silent-setup-alt.sh,file:sign-database-build.sh,file:sign-database-build-alt.sh,file:idempiereEnvTemplate.properties,file:../org.idempiere.equinox.p2.director-feature/director.sh,file:../org.idempiere.equinox.p2.director-feature/update.sh,file:../org.idempiere.equinox.p2.director-feature/update-prd.sh
|
||||
root.win32.win32.x86.folder.utils=utils.windows,utils.unix
|
||||
#windows 64
|
||||
root.win32.win32.x86_64=file:setup.bat,file:console-setup.bat,file:silent-setup.bat,file:idempiere-server.bat,file:setup-alt.bat,file:console-setup-alt.bat,file:silent-setup-alt.bat,file:sign-database-build.bat,file:sign-database-build-alt.bat,file:idempiereEnvTemplate.properties,file:../Credits.html,file:../org.idempiere.equinox.p2.director-feature/director.bat,file:../org.idempiere.equinox.p2.director-feature/update.bat,file:../org.idempiere.equinox.p2.director-feature/update-prd.bat
|
||||
root.win32.win32.x86_64.folder.utils=utils.windows
|
||||
root.win32.win32.x86_64=file:setup.bat,file:console-setup.bat,file:silent-setup.bat,file:idempiere-server.bat,file:setup-alt.bat,file:console-setup-alt.bat,file:silent-setup-alt.bat,file:sign-database-build.bat,file:sign-database-build-alt.bat,file:idempiereEnvTemplate.properties,file:../Credits.html,file:../org.idempiere.equinox.p2.director-feature/director.bat,file:../org.idempiere.equinox.p2.director-feature/update.bat,file:../org.idempiere.equinox.p2.director-feature/update-prd.bat,file:setup.sh,file:console-setup.sh,file:silent-setup.sh,file:idempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh,file:silent-setup-alt.sh,file:sign-database-build.sh,file:sign-database-build-alt.sh,file:idempiereEnvTemplate.properties,file:../org.idempiere.equinox.p2.director-feature/director.sh,file:../org.idempiere.equinox.p2.director-feature/update.sh,file:../org.idempiere.equinox.p2.director-feature/update-prd.sh
|
||||
root.win32.win32.x86_64.folder.utils=utils.windows,utils.unix
|
||||
#solaris
|
||||
root.solaris.gtk.x86=file:setup.sh,file:console-setup.sh,file:silent-setup.sh,file:idempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh,file:silent-setup-alt.sh,file:sign-database-build.sh,file:sign-database-build-alt.sh,file:idempiereEnvTemplate.properties,file:../Credits.html,file:../org.idempiere.equinox.p2.director-feature/director.sh,file:../org.idempiere.equinox.p2.director-feature/update.sh,file:../org.idempiere.equinox.p2.director-feature/update-prd.sh
|
||||
root.solaris.gtk.x86.folder.utils=utils.unix
|
||||
|
|
|
|||
|
|
@ -72,9 +72,16 @@
|
|||
<copy file="utils/RUN_WinEnvTemplate.bat"
|
||||
tofile="utils/RUN_WinEnv.bat" filtering="yes" overwrite="yes" />
|
||||
|
||||
<delete>
|
||||
<fileset dir="." includes="**/*.sh" />
|
||||
</delete>
|
||||
<!-- Filter files No Overwrite -->
|
||||
<copy file="utils/myDBcopyTemplate.sh"
|
||||
tofile="utils/myDBcopy.sh" filtering="yes" overwrite="no" />
|
||||
|
||||
<!-- Filter files Overwrite -->
|
||||
<copy file="utils/myEnvironmentTemplate.sh"
|
||||
tofile="utils/myEnvironment.sh" filtering="yes" overwrite="yes" />
|
||||
|
||||
<copy file="utils/RUN_UnixEnvTemplate.sh"
|
||||
tofile="utils/RUN_UnixEnv.sh" filtering="yes" overwrite="yes" />
|
||||
|
||||
</target>
|
||||
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ fi
|
|||
find . -name '*.sh' -exec chmod u+x '{}' \;
|
||||
|
||||
# Setup idempiere.properties and idempiereEnv.properties
|
||||
$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.console-application $@
|
||||
"$JAVA" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.console-application $@
|
||||
|
||||
# Setup Jetty
|
||||
$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
|
||||
"$JAVA" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
|
||||
|
||||
echo .
|
||||
echo For problems, check log file in base directory
|
||||
|
|
|
|||
|
|
@ -51,4 +51,4 @@ VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl
|
|||
--add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED
|
||||
--add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
|
||||
|
||||
$JAVA ${DEBUG} $IDEMPIERE_JAVA_OPTIONS $VMOPTS -jar "$BASE"/plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.server.application
|
||||
"$JAVA" ${DEBUG} $IDEMPIERE_JAVA_OPTIONS $VMOPTS -jar "$BASE"/plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.server.application
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ fi
|
|||
find . -name '*.sh' -exec chmod u+x '{}' \;
|
||||
|
||||
#setup idempiere.properties and idempiereEnv.propertiess
|
||||
$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.application $@
|
||||
"$JAVA" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.application $@
|
||||
|
||||
echo ... Setup Jetty
|
||||
#setup jetty
|
||||
$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
|
||||
"$JAVA" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
|
||||
|
||||
echo ...
|
||||
echo For problems, check log file in base directory
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ else
|
|||
fi
|
||||
|
||||
# sign database build
|
||||
$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.base.SignDatabaseBuildApplication
|
||||
"$JAVA" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.base.SignDatabaseBuildApplication
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ fi
|
|||
find . -name '*.sh' -exec chmod u+x '{}' \;
|
||||
|
||||
# Setup idempiere.properties and idempiereEnv.properties
|
||||
$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.silent-application $@
|
||||
"$JAVA" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.silent-application $@
|
||||
|
||||
if [ -s idempiere.properties ]
|
||||
then
|
||||
# Setup Jetty
|
||||
$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
|
||||
"$JAVA" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
|
||||
fi
|
||||
|
||||
echo .
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ cd .. || (echo "Cannot cd .."; exit 1)
|
|||
|
||||
echo This Procedure import packin files from directory "$DIRECTORY"
|
||||
|
||||
$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.base.PackInFolderApplication "$DIRECTORY"
|
||||
"$JAVA" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.base.PackInFolderApplication "$DIRECTORY"
|
||||
|
||||
echo Done
|
||||
echo .
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ cd ..
|
|||
|
||||
echo This Procedure synchronize terminology
|
||||
|
||||
$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -application org.adempiere.install.translation sync
|
||||
"$JAVA" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -application org.adempiere.install.translation sync
|
||||
|
||||
echo Done
|
||||
echo .
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ cd ..
|
|||
|
||||
echo This Procedure exports language $AD_LANGUAGE to directory "$DIRECTORY"
|
||||
|
||||
$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.install.translation export "$DIRECTORY" $AD_LANGUAGE
|
||||
"$JAVA" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.install.translation export "$DIRECTORY" $AD_LANGUAGE
|
||||
|
||||
echo Done
|
||||
echo .
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ cd ..
|
|||
|
||||
echo This Procedure imports language $AD_LANGUAGE from directory "$DIRECTORY"
|
||||
|
||||
$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.install.translation import "$DIRECTORY" $AD_LANGUAGE
|
||||
"$JAVA" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=false -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.install.translation import "$DIRECTORY" $AD_LANGUAGE
|
||||
|
||||
echo Done
|
||||
echo .
|
||||
|
|
|
|||
|
|
@ -8,11 +8,19 @@ else
|
|||
if [[ "$DIR" == *utils ]]
|
||||
then
|
||||
VARFILE="$DIR/../.idpass"
|
||||
ENVFILE="$DIR/../idempiereEnv.properties"
|
||||
else
|
||||
VARFILE="$DIR/../../.idpass"
|
||||
ENVFILE="$DIR/../../idempiereEnv.properties"
|
||||
fi
|
||||
if [ ! -f "$VARFILE" ]
|
||||
then
|
||||
VALUE=$( grep "${VARIABLE}" "${ENVFILE}" | sed -e "s/^${VARIABLE}=//" )
|
||||
if [ -n "${VALUE}" ]
|
||||
then
|
||||
echo "${VALUE}"
|
||||
exit 0
|
||||
fi
|
||||
echo "Variables file does not exist"
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue