midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 2023-10-05 10:13:12 +02:00 committed by GitHub
parent 5506aa7ae4
commit 64b9415ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.adempiere.server-feature/build.properties
View File

@ -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.folder.utils=utils.unix
root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
#windows #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=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 root.win32.win32.x86.folder.utils=utils.windows,utils.unix
#windows 64 #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=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 root.win32.win32.x86_64.folder.utils=utils.windows,utils.unix
#solaris #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=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 root.solaris.gtk.x86.folder.utils=utils.unix

13
org.adempiere.server-feature/build.xml
View File

@ -72,9 +72,16 @@
<copy file="utils/RUN_WinEnvTemplate.bat" <copy file="utils/RUN_WinEnvTemplate.bat"
tofile="utils/RUN_WinEnv.bat" filtering="yes" overwrite="yes" /> tofile="utils/RUN_WinEnv.bat" filtering="yes" overwrite="yes" />
<delete> <!-- Filter files No Overwrite -->
<fileset dir="." includes="**/*.sh" /> <copy file="utils/myDBcopyTemplate.sh"
</delete> 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> </target>

4
org.adempiere.server-feature/console-setup-alt.sh
View File

@ -16,10 +16,10 @@ fi
find . -name '*.sh' -exec chmod u+x '{}' \; find . -name '*.sh' -exec chmod u+x '{}' \;
# Setup idempiere.properties and idempiereEnv.properties # 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 # 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 .
echo For problems, check log file in base directory echo For problems, check log file in base directory

2
org.adempiere.server-feature/idempiere-server.sh
View File

@ -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.sql.rowset/com.sun.rowset=ALL-UNNAMED
--add-exports java.naming/com.sun.jndi.ldap=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

4
org.adempiere.server-feature/setup-alt.sh
View File

@ -16,11 +16,11 @@ fi
find . -name '*.sh' -exec chmod u+x '{}' \; find . -name '*.sh' -exec chmod u+x '{}' \;
#setup idempiere.properties and idempiereEnv.propertiess #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 echo ... Setup Jetty
#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 ...
echo For problems, check log file in base directory echo For problems, check log file in base directory

2
org.adempiere.server-feature/sign-database-build-alt.sh
View File

@ -10,4 +10,4 @@ else
fi fi
# sign database build # 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

4
org.adempiere.server-feature/silent-setup-alt.sh
View File

@ -16,12 +16,12 @@ fi
find . -name '*.sh' -exec chmod u+x '{}' \; find . -name '*.sh' -exec chmod u+x '{}' \;
# Setup idempiere.properties and idempiereEnv.properties # 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 ] if [ -s idempiere.properties ]
then then
# 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
fi fi
echo . echo .

2
org.adempiere.server-feature/utils.unix/RUN_ApplyPackInFromFolder.sh
View File

@ -29,7 +29,7 @@ cd .. || (echo "Cannot cd .."; exit 1)
echo This Procedure import packin files from directory "$DIRECTORY" 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 Done
echo . echo .

2
org.adempiere.server-feature/utils.unix/RUN_SyncTerm.sh
View File

@ -21,7 +21,7 @@ cd ..
echo This Procedure synchronize terminology 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 Done
echo . echo .

2
org.adempiere.server-feature/utils.unix/RUN_TrlExport.sh
View File

@ -36,7 +36,7 @@ cd ..
echo This Procedure exports language $AD_LANGUAGE to directory "$DIRECTORY" 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 Done
echo . echo .

2
org.adempiere.server-feature/utils.unix/RUN_TrlImport.sh
View File

@ -36,7 +36,7 @@ cd ..
echo This Procedure imports language $AD_LANGUAGE from directory "$DIRECTORY" 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 Done
echo . echo .

8
org.adempiere.server-feature/utils.unix/getVar.sh Executable file → Normal file
View File

@ -8,11 +8,19 @@ else
if [[ "$DIR" == *utils ]] if [[ "$DIR" == *utils ]]
then then
VARFILE="$DIR/../.idpass" VARFILE="$DIR/../.idpass"
ENVFILE="$DIR/../idempiereEnv.properties"
else else
VARFILE="$DIR/../../.idpass" VARFILE="$DIR/../../.idpass"
ENVFILE="$DIR/../../idempiereEnv.properties"
fi fi
if [ ! -f "$VARFILE" ] if [ ! -f "$VARFILE" ]
then then
VALUE=$( grep "${VARIABLE}" "${ENVFILE}" | sed -e "s/^${VARIABLE}=//" )
if [ -n "${VALUE}" ]
then
echo "${VALUE}"
exit 0
fi
echo "Variables file does not exist" echo "Variables file does not exist"
exit 1 exit 1
fi fi