X-Git-Url: https://dev.renevier.net/gitweb.cgi?p=syp.git;a=blobdiff_plain;f=build.sh;h=216a2ad41fe38127adf0cea6e00cc46415c4925e;hp=5b8711ce2611299c44a9d306c7c8cc1ac3974de6;hb=4414f33ecd172ea188660a45c8d8fb3469416d4f;hpb=0feade23ffa41ac299b252a93be4da11bc2a16b7

diff --git a/build.sh b/build.sh
index 5b8711c..216a2ad 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-PROJVERS=0.0.1
+PROJVERS=0.4
 PROJNAME=syp
 
 BUILDDIR=${1:-build}
@@ -13,9 +13,11 @@ mkdir -p $DESTDIR
 
 # php includes
 cp -RLp inc/ $DESTDIR/
+# removes generated settings in case it exists
+rm -f $DESTDIR/inc/settings.php
 
 # other php files
-cp -p admin.*php index.*php api.php items.php logout.php wizard.php $DESTDIR/
+cp -p admin.*php index.*php upgrade.*php install.*php news.php api.php items.php logout.php $DESTDIR/
 
 # media
 cp -RLp media/ $DESTDIR/
@@ -26,8 +28,23 @@ cd openlayers/build/
 python build.py ../../syp.cfg
 cd ../../
 cp -RLp openlayers/build/OpenLayers.js $DESTDIR/openlayers/
-cp -RLp openlayers/img/ $DESTDIR/openlayers/
-cp -RLp openlayers/theme/ $DESTDIR/openlayers/
+
+# openlayers images
+mkdir $DESTDIR/openlayers/img
+for file in east-mini.png \
+            north-mini.png \
+            blank.gif \
+            west-mini.png \
+            zoom-plus-mini.png \
+            south-mini.png \
+            zoom-minus-mini.png \
+            zoom-world-mini.png; do
+    cp -p openlayers/img/$file $DESTDIR/openlayers/img
+done
+# openlayers theme
+mkdir -p $DESTDIR/openlayers/theme/default/img
+cp -Lp openlayers/theme/default/style.css $DESTDIR/openlayers/theme/default/style.css
+cp -RLp openlayers/theme/default/img/close.gif $DESTDIR/openlayers/theme/default/img
 
 # other javascript
 cp -RLp js/ $DESTDIR/
@@ -39,15 +56,19 @@ for file in $DESTDIR/js/jquery-*.min.js; do
     mv $file $DESTDIR/js/jquery-$jversion.js
 done
 
-# copyright and readme files
-cp -p license.txt README.txt COPYING.txt $DESTDIR/
+# copyright and readme and changes files
+cp -p license.txt COPYING.txt README.txt CHANGES.txt $DESTDIR/
 
 # creates upload directory
-mkdir $DESTDIR/upload
-chmod a+wx $DESTDIR/upload
+mkdir -p $DESTDIR/upload/_thumbs
+chmod -R a+wx $DESTDIR/upload
 
 # generate sources
 cd $BUILDDIR
 tar -pczf ${PROJNAME}_${PROJVERS}.tar.gz ${PROJNAME}-${PROJVERS}
 zip -r ${PROJNAME}_${PROJVERS}.zip ${PROJNAME}-${PROJVERS}
 cd ..
+
+if [ -d .git/ ] && which git > /dev/null; then
+    git checkout openlayers
+fi