Setup script fixed to set other externals for non-qa projects

diff --git a/.gitattributes b/.gitattributes
index 1c4f05abb0cf65159f039fe7f12a5affed5e1c2c..04db7bb26ecb6c47db4f068e3a0dc57144df7c82 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 * text=auto !eol
 * text=auto !eol

+/application-external.txt -text

 docs/COPYING -text
 docs/COPYING.documents -text
 docs/COPYING.software -text
 docs/COPYING -text
 docs/COPYING.documents -text
 docs/COPYING.software -text

diff --git a/application-external.txt b/application-external.txt
new file mode 100644 (file)
index 0000000..d21f5f8
--- /dev/null
+++ b/application-external.txt
@@ -0,0 +1,3 @@
+admin http://www.ship-simu.org/repos/admin/trunk/application/admin/ 
+install http://www.ship-simu.org/repos/install/trunk/application/install/ 
+qa http://www.ship-simu.org/repos/qa/trunk/application/qa/

diff --git a/setup-repos.sh b/setup-repos.sh
index 41db15aa0c67939475de31ca15cb058fcfe7da7c..bd7820ab3c4b2700dfd7d17d94f5dc935fd47d62 100755 (executable)
--- a/setup-repos.sh
+++ b/setup-repos.sh
@@ -30,9 +30,12 @@ echo "$0: Linking to external 'core' repository ..."
 svn propset svn:externals -F ../../core/trunk/svn-externals.txt . || exit 255
 if (test "$1" != "admin" && test "$1" != "install"); then
        cd application/
 svn propset svn:externals -F ../../core/trunk/svn-externals.txt . || exit 255
 if (test "$1" != "admin" && test "$1" != "install"); then
        cd application/

-       svn propset svn:externals "admin http://www.ship-simu.org/repos/admin/trunk/application/admin/
-install http://www.ship-simu.org/repos/install/trunk/application/install/
-qa http://www.ship-simu.org/repos/qa/trunk/application/qa/" . || exit 255
+       if test "$1" != "qa"; then
+               svn propset svn:externals -F ../../../core/trunk/application-external.txt . || exit 255
+       else
+               svn propset svn:externals "admin http://www.ship-simu.org/repos/admin/trunk/application/admin/ 
+install http://www.ship-simu.org/repos/install/trunk/application/install/" . || exit 255
+       fi

        cd .. # trunk
 else
        echo "$0: --- Not setting admin external source. ---"
        cd .. # trunk
 else
        echo "$0: --- Not setting admin external source. ---"