svn commit: r1783204 - in /ofbiz/ofbiz-framework/trunk/tools: mergefromtrunk.bat mergefromtrunk.sh revert.bat

Author: jleroux
Date: Thu Feb 16 13:39:13 2017
New Revision: 1783204

URL: http://svn.apache.org/viewvc?rev=1783204&view=rev
Log:
No functional change, updates files with new svn url

Removes useless cleanBuild.bat

Modified:
    ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.bat
    ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.sh
    ofbiz/ofbiz-framework/trunk/tools/revert.bat

Modified: ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.bat?rev=1783204&r1=1783203&r2=1783204&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.bat (original)
+++ ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.bat Thu Feb 16 13:39:13 2017
@@ -1,4 +1,4 @@
-@echo off
+s@echo off
 rem #####################################################################
 rem Licensed to the Apache Software Foundation (ASF) under one
 rem or more contributor license agreements.  See the NOTICE file
@@ -30,14 +30,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu

Modified: ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.sh?rev=1783204&r1=1783203&r2=1783204&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.sh (original)
+++ ofbiz/ofbiz-framework/trunk/tools/mergefromtrunk.sh Thu Feb 16 13:39:13 2017
@@ -84,13 +84,13 @@ case "$cmd" in
         # chained pipe; if one of the commands in the pipe fails,
         # it isn't possible to detect the failure.
         printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
-        svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+        svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
         set -- $(wc -l runtime/merge-state/log.txt)
         head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
         tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
         prevRev=$(($rev - 1))
         svn up
-        svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk
+        svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
         ;;
     (test)
         ./gradlew cleanAll loadDefault testIntegration

Modified: ofbiz/ofbiz-framework/trunk/tools/revert.bat
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/tools/revert.bat?rev=1783204&r1=1783203&r2=1783204&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/tools/revert.bat (original)
+++ ofbiz/ofbiz-framework/trunk/tools/revert.bat Thu Feb 16 13:39:13 2017
@@ -20,4 +20,4 @@ rem ####################################
 
 rem to revert back a revision in local copy.
 echo on
-svn up && svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/trunk
+svn up && svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk