svn commit: r1859876 - in /ofbiz/tools/demo-backup: Nicolas/functions.sh Nicolas/trunk.sh trunk.sh

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1859876 - in /ofbiz/tools/demo-backup: Nicolas/functions.sh Nicolas/trunk.sh trunk.sh

nmalin
Author: nmalin
Date: Fri May 24 13:44:11 2019
New Revision: 1859876

URL: http://svn.apache.org/viewvc?rev=1859876&view=rev
Log:
Improved: Call nit-gradle-wrapper.sh if gradlew not present
To prepare commit issue :
    Remove the Gradle wrapper from our release packages
    and add a step to our build notes (OFBIZ-10145)

Modified:
    ofbiz/tools/demo-backup/Nicolas/functions.sh
    ofbiz/tools/demo-backup/Nicolas/trunk.sh
    ofbiz/tools/demo-backup/trunk.sh

Modified: ofbiz/tools/demo-backup/Nicolas/functions.sh
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/functions.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/Nicolas/functions.sh (original)
+++ ofbiz/tools/demo-backup/Nicolas/functions.sh Fri May 24 13:44:11 2019
@@ -37,4 +37,11 @@ applyPatches () {
     for i in $(ls $2); do
         patch -p0 < $2/$i;
     done
+}
+
+#control if gradlew is present, otherwise init it before
+checkGradlew () {
+    if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
+        sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
+    fi
 }
\ No newline at end of file

Modified: ofbiz/tools/demo-backup/Nicolas/trunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/trunk.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/Nicolas/trunk.sh (original)
+++ ofbiz/tools/demo-backup/Nicolas/trunk.sh Fri May 24 13:44:11 2019
@@ -18,6 +18,8 @@ removeUneededFiles $OFBIZ_DIR
 
 applyPatches $OFBIZ_DIR ~/patch/trunk
 
+checkGradlew
+
 # run OFBiz
 ./gradlew --no-daemon loadAll
 ./gradlew --no-daemon svnInfoFooter

Modified: ofbiz/tools/demo-backup/trunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/trunk.sh?rev=1859876&r1=1859875&r2=1859876&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/trunk.sh (original)
+++ ofbiz/tools/demo-backup/trunk.sh Fri May 24 13:44:11 2019
@@ -4,6 +4,11 @@ cd /home/ofbizDemo/trunk
 svn up
 rm /home/ofbizDemo/trunk/framework/base/config/*.jks
 rm /home/ofbizDemo/trunk/framework/base/config/jesse.properties
+
+if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
+    sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
+fi
+
 ./gradlew --no-daemon pullAllPluginsSource
 ./gradlew --no-daemon terminateOfbiz
 ./gradlew --no-daemon cleanAll