fixes init.sh script (and do not put openlayers in submodule)

diff --git a/.gitignore b/.gitignore
index be7a8d5388ce5b04cb68b0d2be438e862459d746..d8c383541d58858a15768741ef662ddb35d7d8a5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ generated/mails.txt
 build/
 scripts/lighttpd.conf
 library/Zend
+public/openlayers

diff --git a/.gitmodules b/.gitmodules
index 7c129cba34fa2bd4c24d1a436665ac9cc83f2dea..d392f02a8a44ea05a237214028fe4d320a912669 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "public/openlayers"]
-       path = public/openlayers
-       url = http://github.com/ccnmtl/openlayers.git
 [submodule "public/modifiablepath"]
        path = public/modifiablepath
        url = git://github.com/arenevier/ModifiablePath.git

diff --git a/public/openlayers b/public/openlayers
deleted file mode 160000 (submodule)
index 27b4b41..0000000
--- a/public/openlayers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 27b4b4180bbaadf9c808a3ccf9f8d556b926e131

diff --git a/scripts/init.sh b/scripts/init.sh
index bbb8817c0bf07669e94ce0f2487213e10baf69b7..aa9579d4fe329aaeec4b2e4221b98c505ea4c3ab 100755 (executable)
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -2,12 +2,11 @@
 
 git submodule update --init
 
-git submodule -q foreach "
-    if ls -A $PWD/patches/\${name##*/} >/dev/null 2>&1; then
-        git checkout master
-        git am $PWD/patches/\${name##*/}/*
-    fi
-"
+OLDPWD=$PWD
+cd public/prototype
+rake
+cd $OLDPWD
 
 sh scripts/updatezend.sh
+sh scripts/updateopenlayers.sh
 sh scripts/reset.postgres.sh -g

diff --git a/scripts/updateopenlayers.sh b/scripts/updateopenlayers.sh
new file mode 100755 (executable)
index 0000000..0f99aac
--- /dev/null
+++ b/scripts/updateopenlayers.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+if [ -d public/openlayers ]; then
+    cd public/openlayers
+    git checkout master
+    git pull -u
+    git checkout syj
+    git rebase master
+else
+    git clone http://github.com/ccnmtl/openlayers.git public/openlayers
+    cd public/openlayers
+    git checkout -b syj
+    git am ../../patches/openlayers/000*
+fi

diff --git a/scripts/updatezend.sh b/scripts/updatezend.sh
index d707812f3fea47f5fa82c4f9dd07477c46cf3de5..90ba32cedd1003571f155d83ee972fa3afe82e6e 100755 (executable)
--- a/scripts/updatezend.sh
+++ b/scripts/updatezend.sh
@@ -6,6 +6,7 @@ if [ -f library/Zend/Version.php ]; then
     php -r "include('library/Zend/Version.php'); exit(Zend_Version::compareVersion(\"$ZEND_VERSION\"));"
     if [ $? -ne 1 ];then
         echo no new version
+        exit
     fi
 fi
 
@@ -13,6 +14,18 @@ echo downloading zend $ZEND_VERSION
 
 wget http://framework.zend.com/releases/ZendFramework-$ZEND_VERSION/ZendFramework-$ZEND_VERSION-minimal.tar.gz
 tar zxf ZendFramework-$ZEND_VERSION-minimal.tar.gz
-rm -rf library/Zend
-mv ZendFramework-$ZEND_VERSION-minimal/library/Zend library/
+if [ -d library/Zend ]; then
+    rm -rf library/Zend/*
+else
+    mkdir -p library/Zend
+fi
+mv ZendFramework-$ZEND_VERSION-minimal/library/Zend/* library/Zend/
 rm -rf ZendFramework-$ZEND_VERSION-minimal ZendFramework-$ZEND_VERSION-minimal.tar.gz
+
+cd library/Zend
+if [ ! -d .git ]; then
+    git init .
+fi
+git add .
+git commit -am "importing Zend $ZEND_VERSION"
+git tag "Zend/$ZEND_VERSION"