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
commit c229e42ecfcdf970b9fcf0002fc2ab478489b853 Author: Jacques Le Roux <[email protected]> AuthorDate: Thu Feb 27 18:40:15 2020 +0100 Removes now useless scripts, related to Svn or Ant --- desktop.ini | 6 --- git-rebase-runner.sh | 63 --------------------------- mergefromplugins.bat | 64 ---------------------------- mergefromplugins.sh | 117 --------------------------------------------------- mergefromtrunk.bat | 64 ---------------------------- mergefromtrunk.sh | 117 --------------------------------------------------- 6 files changed, 431 deletions(-) diff --git a/desktop.ini b/desktop.ini deleted file mode 100644 index 2237e22..0000000 --- a/desktop.ini +++ /dev/null @@ -1,6 +0,0 @@ -[ViewState] -Mode= -Vid= -FolderType=Generic -[.ShellClassInfo] -IconResource=C:\Windows\system32\SHELL32.dll,90 diff --git a/git-rebase-runner.sh b/git-rebase-runner.sh deleted file mode 100755 index 0781989..0000000 --- a/git-rebase-runner.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -##################################################################### -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -##################################################################### - -# args: -# $1 = loop count -# $2 = loop type - -# example: -# git rebase -i $most_recent_git_svn_commit_hash -# # select commits to work on/test with 'edit' -# tools/git-rebase-runner.sh 5 all-tests -# -# this will do: -# ant clean -# ant load-demo -# ant run-tests -# ant clean -# git rebase --continue -# in a loop 5 times, storing the output into runtime/git-rebase/logs. -# You can use this to verify a series of commits before commiting -# upstream in bulk with git svn dcommit $hash - -top_dir="$(cd "$0/../..";echo "$PWD")" -. "$top_dir/tools/functions.sh" - -cd "$top_dir" - -loops="$1" -shift -cleanup_worker="" -loop_worker="" -case "$1" in - (all-tests) - cleanup_worker=standard_cleanup - loop_worker=fulltestsuite_worker - ;; - (install) - cleanup_worker=standard_cleanup - loop_worker=install_worker - ;; - (*) - echo "Invalid loop type given($1)!" 1>&2 - exit 1 - ;; -esac -git_rebase_runner $loops $cleanup_worker $loop_worker diff --git a/mergefromplugins.bat b/mergefromplugins.bat deleted file mode 100755 index 0018ac2..0000000 --- a/mergefromplugins.bat +++ /dev/null @@ -1,64 +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 ##################################################################### -rem interactive DOS version of mergefromtrunk.sh. -rem to use : launch and pass the trunk version number to merge in release - -rem since we have now svn:mergeinfo changing root ("."), we need to update before merging -svn up - -rem version to merge -set /p version=version to merge : -set /a prevRev=%version% - 1 - -rem build the comment -echo "Applied fix from plugins for revision: %version%" > comment.tmp -svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk -r %version% > log.tmp -copy /b 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/ofbiz-plugins/trunk -echo off - -:menu -echo y) tests -echo n) exit - -echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)? -choice /c:yn -if errorlevel = 2 goto commit -if errorlevel = 1 goto tests - -:commit -echo on -svn commit -F comment.tmp -goto exit - -:tests -echo on -gradlew cleanAll loadAll testIntegration -echo off - -echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root - -:exit -pause diff --git a/mergefromplugins.sh b/mergefromplugins.sh deleted file mode 100755 index c61725c..0000000 --- a/mergefromplugins.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -##################################################################### -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -##################################################################### -set -e - -# this script requires a posix shell; namely, $(( math evaluation. - -help() { - cat << _EOF_ -$0 [options] - -mergefromtrunk.sh merge \$rev Apply revision \$rev from trunk. -mergefromtrunk.sh test Run test suite(clean-all, load-demo, run-tests). -mergefromtrunk.sh commit Commit current fix to svn. -mergefromtrunk.sh abort Abort current merge session. - --h | --help Show this help. -_EOF_ -} - -cmd="" -rev="" -while [ $# -gt 0 ]; do - case "$1" in - (-h|--help) - help - exit 0 - ;; - (-*) - echo "Unknown arg ($1)." 1>&2 - help 1>&2 - exit 1 - ;; - (*) - if [ z = "z$cmd" ]; then - cmd="$1" - else - case "$cmd" in - (merge) - rev="$1" - ;; - (*) - echo "Too many arguments." 1>&2 - help 1>&2 - exit 1 - ;; - esac - fi - ;; - esac - shift -done -case "$cmd" in - (merge) - if [ z = "z$rev" ]; then - echo "Need a revision." 1>&2 - help 1>&2 - exit 1 - fi - if [ -d runtime/merge-state ]; then - echo "Merge session already started." 1>&2 - help 1>&2 - exit 1 - fi - mkdir -p runtime/merge-state - echo "$rev" > runtime/merge-state/revision - # do not run any of the following commands in a complex - # 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/ofbiz-plugins/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/ofbiz-plugins/trunk - ;; - (test) - ./gradlew cleanAll loadAll testIntegration - ;; - (commit) - svn commit -F runtime/merge-state/log-message - rm -rf runtime/merge-state - ;; - (abort) - svn resolved . -R - svn revert . -R - rm -rf runtime/merge-state - ;; - ("") - echo "Need a command and a revision." 1>&2 - help 1>&2 - exit 1 - ;; - (*) - echo "Unknown command($cmd)." 1>&2 - help 1>&2 - exit 1 - ;; -esac diff --git a/mergefromtrunk.bat b/mergefromtrunk.bat deleted file mode 100755 index 144075b..0000000 --- a/mergefromtrunk.bat +++ /dev/null @@ -1,64 +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 ##################################################################### -rem interactive DOS version of mergefromtrunk.sh. -rem to use : launch and pass the trunk version number to merge in release - -rem since we have now svn:mergeinfo changing root ("."), we need to update before merging -svn up - -rem version to merge -set /p version=version to merge : -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/ofbiz-framework/trunk -r %version% > log.tmp -copy /b 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/ofbiz-framework/trunk -echo off - -:menu -echo y) tests -echo n) exit - -echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)? -choice /c:yn -if errorlevel = 2 goto commit -if errorlevel = 1 goto tests - -:commit -echo on -svn commit -F comment.tmp -goto exit - -:tests -echo on -gradlew cleanAll loadAll testIntegration -echo off - -echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root - -:exit -pause diff --git a/mergefromtrunk.sh b/mergefromtrunk.sh deleted file mode 100755 index a399234..0000000 --- a/mergefromtrunk.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -##################################################################### -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -##################################################################### -set -e - -# this script requires a posix shell; namely, $(( math evaluation. - -help() { - cat << _EOF_ -$0 [options] - -mergefromtrunk.sh merge \$rev Apply revision \$rev from trunk. -mergefromtrunk.sh test Run test suite(clean-all, load-demo, run-tests). -mergefromtrunk.sh commit Commit current fix to svn. -mergefromtrunk.sh abort Abort current merge session. - --h | --help Show this help. -_EOF_ -} - -cmd="" -rev="" -while [ $# -gt 0 ]; do - case "$1" in - (-h|--help) - help - exit 0 - ;; - (-*) - echo "Unknown arg ($1)." 1>&2 - help 1>&2 - exit 1 - ;; - (*) - if [ z = "z$cmd" ]; then - cmd="$1" - else - case "$cmd" in - (merge) - rev="$1" - ;; - (*) - echo "Too many arguments." 1>&2 - help 1>&2 - exit 1 - ;; - esac - fi - ;; - esac - shift -done -case "$cmd" in - (merge) - if [ z = "z$rev" ]; then - echo "Need a revision." 1>&2 - help 1>&2 - exit 1 - fi - if [ -d runtime/merge-state ]; then - echo "Merge session already started." 1>&2 - help 1>&2 - exit 1 - fi - mkdir -p runtime/merge-state - echo "$rev" > runtime/merge-state/revision - # do not run any of the following commands in a complex - # 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/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/ofbiz-framework/trunk - ;; - (test) - ./gradlew cleanAll loadAll testIntegration - ;; - (commit) - svn commit -F runtime/merge-state/log-message - rm -rf runtime/merge-state - ;; - (abort) - svn resolved . -R - svn revert . -R - rm -rf runtime/merge-state - ;; - ("") - echo "Need a command and a revision." 1>&2 - help 1>&2 - exit 1 - ;; - (*) - echo "Unknown command($cmd)." 1>&2 - help 1>&2 - exit 1 - ;; -esac
