Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / make_tarball / make.sh

diff --git a/projects/make_tarball/make.sh b/projects/make_tarball/make.sh
index f9903e07b1c2ee67aad4c378bfea7632596f2f89..0c052724dd9864781dda777ddad3b7e77dabf78c 100755 (executable)
--- a/projects/make_tarball/make.sh
+++ b/projects/make_tarball/make.sh
@@ -3,7 +3,7 @@
 SRC_DIR=stg-2.4-`date "+%Y.%m.%d-%H.%M.%S"`
 ARC_NAME=$SRC_DIR.tar.gz
 
 SRC_DIR=stg-2.4-`date "+%Y.%m.%d-%H.%M.%S"`
 ARC_NAME=$SRC_DIR.tar.gz
 

-git clone git://madf.dyndns.org/stg.git $SRC_DIR
+git clone git://gitorious.org/stg/stg.git $SRC_DIR

 
 if [ $? != 0 ]
 then
 
 if [ $? != 0 ]
 then


@@ -12,11 +12,19 @@ then
 fi
 
 rm -rf $SRC_DIR/.git
 fi
 
 rm -rf $SRC_DIR/.git

-rm -rf $SRC_DIR/.gitignore
+rm -f $SRC_DIR/.gitignore

 rm -r $SRC_DIR/projects/make_tarball
 rm -r $SRC_DIR/projects/traffcounter
 rm -r $SRC_DIR/projects/make_tarball
 rm -r $SRC_DIR/projects/traffcounter

-rm -r $SRC_DIR/projects/stargazer/plugins/other/userstat
+rm -r $SRC_DIR/projects/sgauthstress

 rm -r $SRC_DIR/projects/stargazer/plugins/authorization/stress
 rm -r $SRC_DIR/projects/stargazer/plugins/authorization/stress

+rm -r $SRC_DIR/projects/stargazer/plugins/configuration/sgconfig2
+rm -r $SRC_DIR/projects/stargazer/plugins/configuration/sgconfig-ng
+rm -r $SRC_DIR/projects/stargazer/plugins/configuration/xrconfig
+rm -r $SRC_DIR/projects/stargazer/plugins/other/userstat

 rm -r $SRC_DIR/projects/stargazer/plugins/store/db
 rm -r $SRC_DIR/projects/stargazer/plugins/store/db

+rm -r $SRC_DIR/doc/help
+rm $SRC_DIR/doc/help.odt
+
+make -C $SRC_DIR/doc/xmlrpc

 
 tar -zcf $ARC_NAME $SRC_DIR
 
 tar -zcf $ARC_NAME $SRC_DIR