[ofbiz-tools] branch master updated: Fixed: Adapts tools scripts to Git (OFBIZ-11273)

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

[ofbiz-tools] branch master updated: Fixed: Adapts tools scripts to Git (OFBIZ-11273)

jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c08120  Fixed: Adapts tools scripts to Git (OFBIZ-11273)
8c08120 is described below

commit 8c0812030dd223f76aa465ed92a7fedb83023d9e
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Wed Nov 6 20:05:57 2019 +0100

    Fixed: Adapts tools scripts to Git
    (OFBIZ-11273)
   
    revert.bat and revert-plugins.bat To test I revert a revert on "trunk"
   
    Removes test.bat, I use a variant locally I'm not sure it's of much use
---
 copyDtds.bat       | 10 +++++-----
 revert-plugins.bat |  2 +-
 revert.bat         |  2 +-
 test.bat           | 27 ---------------------------
 updateWiki.bat     | 14 +++++++-------
 5 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/copyDtds.bat b/copyDtds.bat
index 261ae1a..be27a2d 100755
--- a/copyDtds.bat
+++ b/copyDtds.bat
@@ -23,10 +23,10 @@ set OFBIZ_HOME=%~p0..\
 
 cd %OFBIZ_HOME%
 echo on
-for /r  %%f in (*.xsd) do copy %%f C:\projectsASF\site\dtds
-del C:\projectsASF\site\dtds\docbook.xsd
+for /r  %%f in (*.xsd) do copy %%f C:\projectsASF\Git\ofbiz-site\dtds
+del C:\projectsASF\Git\ofbiz-site\dtds\docbook.xsd
 
-cd ..\site
-TortoiseProc /command:commit /path:"C:\projectsASF\site*C:\projectsASF\ofbiz\"
+cd ..\ofbiz-site
+TortoiseGitProc /command:commit
 
-cd C:\projectsASF\ofbiz
\ No newline at end of file
+cd ..\ofbiz-framework
\ No newline at end of file
diff --git a/revert-plugins.bat b/revert-plugins.bat
index 9d01949..8e632b5 100755
--- a/revert-plugins.bat
+++ b/revert-plugins.bat
@@ -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/ofbiz-plugins/trunk
+git stash && git pull && git revert %1
diff --git a/revert.bat b/revert.bat
index dec852e..8e632b5 100644
--- a/revert.bat
+++ b/revert.bat
@@ -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/ofbiz-framework/trunk
+git stash && git pull && git revert %1
diff --git a/test.bat b/test.bat
deleted file mode 100644
index 57a6197..0000000
--- a/test.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-@echo off
-rem #####################################################################
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements.  See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership.  The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License"); you may not use this file except in compliance
-rem with the License.  You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied.  See the License for the
-rem specific language governing permissions and limitations
-rem under the License.
-rem #####################################################################
-
-%~d0
-set OFBIZ_HOME=%~p0..\
-
-rem ### Simple easy to read line
-cd %OFBIZ_HOME%
-echo on
-svn up && gradlew cleanAll eclipse loadAll testIntegration
\ No newline at end of file
diff --git a/updateWiki.bat b/updateWiki.bat
index 72a087d..6c137a1 100755
--- a/updateWiki.bat
+++ b/updateWiki.bat
@@ -1,14 +1,14 @@
-call asciidoctor README.adoc -o tools/wiki-files/README.html
+cd tools
 
-pandoc applications/datamodel/DATAMODEL_CHANGES.md -s -o tools/wiki-files/data-model/DATAMODEL_CHANGES.md.html
+call asciidoctor ..\README.adoc -o wiki-files/README.html
 
-pandoc themes/README.md -s -o tools/wiki-files/themes/README.md.html
+pandoc ..\applications/datamodel/DATAMODEL_CHANGES.md -s -o wiki-files/data-model/DATAMODEL_CHANGES.md.html
 
-pandoc tools/demo-backup/README.md -s -o tools/wiki-files/demos/README.md.html
-pandoc tools/documentation/BuildBot/BuildBot.md -s -o tools/wiki-files/BuildBot/BuildBot.md.html
+pandoc ..\themes/README.md -s -o wiki-files/themes/README.md.html
 
+pandoc demo-backup/README.md -s -o wiki-files/demos/README.md.html
+pandoc documentation/BuildBot/BuildBot.md -s -o wiki-files/BuildBot/BuildBot.md.html
 
-cd tools
-TortoiseProc /command:commit /path:"C:\projectsASF\ofbiz\tools*C:\projectsASF\ofbiz\"
+TortoiseGitProc /command:commit
 
 cd..
\ No newline at end of file