Revision: 73189
http://sourceforge.net/p/brlcad/code/73189
Author: starseeker
Date: 2019-05-26 23:44:37 +0000 (Sun, 26 May 2019)
Log Message:
-----------
Start tweaking sync scripts for new setup.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svnfexport/custom/sync_commit.sh
brlcad/trunk/misc/repoconv/svnfexport/custom/sync_commit_trunk.sh
Modified: brlcad/trunk/misc/repoconv/svnfexport/custom/sync_commit.sh
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/custom/sync_commit.sh 2019-05-26
19:35:32 UTC (rev 73188)
+++ brlcad/trunk/misc/repoconv/svnfexport/custom/sync_commit.sh 2019-05-26
23:44:37 UTC (rev 73189)
@@ -1,6 +1,6 @@
#!/bin/sh
-svn co -q file://$1/brlcad/branches/$2@$3 stable-$3
-cd stable-$3
+svn co -q file://$1/brlcad/branches/$2@$3 $2-$3
+cd $2-$3
cp ../terra.dsp ./db/terra.dsp
find . -name \.svn | xargs rm -rf
../checkout_dercs.sh
@@ -10,7 +10,7 @@
sed -i 's/\.\///' ../noexec.txt
cat ../exec.txt |xargs git hash-object > ../exec_hashes.txt
cat ../noexec.txt |xargs git hash-object > ../noexec_hashes.txt
-echo "deleteall" > ../commit-$3.fi
+echo "deleteall" > ../custom/$3-tree.fi
#https://www.linuxquestions.org/questions/showthread.php?p=1682282#post1682282
awk '
BEGIN {
@@ -22,7 +22,7 @@
}
{
print "M 100755", f1[NR], "\""$1"\""
-} ' ../exec.txt >> ../commit-$3.fi
+} ' ../exec.txt >> ../custom/$3-tree.fi
awk '
BEGIN {
while ( getline < "../noexec_hashes.txt" > 0 )
@@ -33,7 +33,7 @@
}
{
print "M 100644", f1[NR], "\""$1"\""
-} ' ../noexec.txt >> ../commit-$3.fi
+} ' ../noexec.txt >> ../custom/$3-tree.fi
rm ../exec.txt
rm ../noexec.txt
rm ../exec_hashes.txt
@@ -42,15 +42,18 @@
# fix sha1 on objects where git and svn disagree
# misc/archlinux/brlcad.install
-sed -i -e
's/2db7d92d08d6b81c9bfac0b5cc232f45b867e0a5/b491df545130756e59e586db082e8be15f8c154b/g'
commit-$3.fi
+sed -i -e
's/2db7d92d08d6b81c9bfac0b5cc232f45b867e0a5/b491df545130756e59e586db082e8be15f8c154b/g'
custom/$3-tree.fi
# doc/docbook/articles/en/images/projection_shader_fig05.png
-sed -i -e
's/b67a1bdac086671244186372498369656e15b482/674bc5bec1631eb373d026e3c35f02580d33d6d9/g'
commit-$3.fi
+sed -i -e
's/b67a1bdac086671244186372498369656e15b482/674bc5bec1631eb373d026e3c35f02580d33d6d9/g'
custom/$3-tree.fi
# doc/docbook/resources/standard/xsl/extensions/xalan27.jar
-sed -i -e
's/8749b32c1b86d101019e7f7b3c3a085b4ea64597/cb090114149cda7052c417e8c2ba557b635b647e/g'
commit-$3.fi
+sed -i -e
's/8749b32c1b86d101019e7f7b3c3a085b4ea64597/cb090114149cda7052c417e8c2ba557b635b647e/g'
custom/$3-tree.fi
# doc/docbook/resources/standard/xsl/extensions/saxon65.jar
-sed -i -e
's/06d5271f3e9ec1ca4411865b26a3e1ac1b64b1e8/744df1a5cb1124b64cee08086f6316c89616c1ae/g'
commit-$3.fi
+sed -i -e
's/06d5271f3e9ec1ca4411865b26a3e1ac1b64b1e8/744df1a5cb1124b64cee08086f6316c89616c1ae/g'
custom/$3-tree.fi
+# regress/gcv/fastgen/fastgen_box.fast4
+sed -i -e
's/3785040dbb9252dcf56f1d3edcfedc8859141339/33ddd71cf9d6b856d94d7bd3c0600f24c1db7120/g'
custom/$3-tree.fi
+
#rm -rf stable-$3
Modified: brlcad/trunk/misc/repoconv/svnfexport/custom/sync_commit_trunk.sh
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/custom/sync_commit_trunk.sh
2019-05-26 19:35:32 UTC (rev 73188)
+++ brlcad/trunk/misc/repoconv/svnfexport/custom/sync_commit_trunk.sh
2019-05-26 23:44:37 UTC (rev 73189)
@@ -10,7 +10,7 @@
sed -i 's/\.\///' ../noexec.txt
cat ../exec.txt |xargs git hash-object > ../exec_hashes.txt
cat ../noexec.txt |xargs git hash-object > ../noexec_hashes.txt
-echo "deleteall" > ../commit-$2.fi
+echo "deleteall" > ../custom/$2-tree.fi
#https://www.linuxquestions.org/questions/showthread.php?p=1682282#post1682282
awk '
BEGIN {
@@ -22,7 +22,7 @@
}
{
print "M 100755", f1[NR], "\""$1"\""
-} ' ../exec.txt >> ../commit-$2.fi
+} ' ../exec.txt >> ../custom/$2-tree.fi
awk '
BEGIN {
while ( getline < "../noexec_hashes.txt" > 0 )
@@ -33,7 +33,7 @@
}
{
print "M 100644", f1[NR], "\""$1"\""
-} ' ../noexec.txt >> ../commit-$2.fi
+} ' ../noexec.txt >> ../custom/$2-tree.fi
rm ../exec.txt
rm ../noexec.txt
rm ../exec_hashes.txt
@@ -42,16 +42,17 @@
# fix sha1 on objects where git and svn disagree
# misc/archlinux/brlcad.install
-sed -i -e
's/2db7d92d08d6b81c9bfac0b5cc232f45b867e0a5/b491df545130756e59e586db082e8be15f8c154b/g'
commit-$2.fi
+sed -i -e
's/2db7d92d08d6b81c9bfac0b5cc232f45b867e0a5/b491df545130756e59e586db082e8be15f8c154b/g'
custom/$2-tree.fi
# doc/docbook/articles/en/images/projection_shader_fig05.png
-sed -i -e
's/b67a1bdac086671244186372498369656e15b482/674bc5bec1631eb373d026e3c35f02580d33d6d9/g'
commit-$2.fi
+sed -i -e
's/b67a1bdac086671244186372498369656e15b482/674bc5bec1631eb373d026e3c35f02580d33d6d9/g'
custom/$2-tree.fi
# doc/docbook/resources/standard/xsl/extensions/xalan27.jar
-sed -i -e
's/8749b32c1b86d101019e7f7b3c3a085b4ea64597/cb090114149cda7052c417e8c2ba557b635b647e/g'
commit-$2.fi
+sed -i -e
's/8749b32c1b86d101019e7f7b3c3a085b4ea64597/cb090114149cda7052c417e8c2ba557b635b647e/g'
custom/$2-tree.fi
# doc/docbook/resources/standard/xsl/extensions/saxon65.jar
-sed -i -e
's/06d5271f3e9ec1ca4411865b26a3e1ac1b64b1e8/744df1a5cb1124b64cee08086f6316c89616c1ae/g'
commit-$2.fi
+sed -i -e
's/06d5271f3e9ec1ca4411865b26a3e1ac1b64b1e8/744df1a5cb1124b64cee08086f6316c89616c1ae/g'
custom/$2-tree.fi
+# regress/gcv/fastgen/fastgen_box.fast4
+sed -i -e
's/3785040dbb9252dcf56f1d3edcfedc8859141339/33ddd71cf9d6b856d94d7bd3c0600f24c1db7120/g'
custom/$2-tree.fi
-#rm -rf trunk-$2
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
