use config.in with common params

diff --git a/etersoft/build_wine.sh b/etersoft/build_wine.sh
index 40eca18e74133d6b9e4612611b87ec2e53396293..682523a9ee4a72e9d89626af5546f4425478eb02 100755 (executable)
--- a/etersoft/build_wine.sh
+++ b/etersoft/build_wine.sh
@@ -6,7 +6,7 @@ if [ "$USER" = "lav" ] ; then
        git-checkout eterhack && git-pull && git-checkout test && git-merge eterhack || exit 1
 fi
 
-export CFLAGS=-D_FORTIFY_SOURCE=2
+export CFLAGS="-D_FORTIFY_SOURCE=2 -g"
 echo "Autoconf..."
 autoconf -f
 ./configure --with-opengl --enable-debug || exit 1

diff --git a/etersoft/config.in b/etersoft/config.in
new file mode 100644 (file)
index 0000000..54fd94b
--- /dev/null
+++ b/etersoft/config.in
@@ -0,0 +1,5 @@
+CURBRANCH=eter-1.0.9
+ETERVERSION=1.0.9
+BRANCH=eter-$ETERVERSION
+ORIGTAG=wine-0.9.60
+VERSION=`date -d today "+%Y%m%d"`

diff --git a/etersoft/create_branches.sh b/etersoft/create_branches.sh
index cfdfe13494509f2704ebfcbe12b0d7e642f79dfd..7719dd3b06c9aafa7304c30aa57f1d8ed49a1ced 100755 (executable)
--- a/etersoft/create_branches.sh
+++ b/etersoft/create_branches.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Creates branches from remote repository origin
+. ./config.in
 
-CURBRANCH=eter-1.0.9
+# Creates branches from remote repository origin
 
 cd ..
 

diff --git a/etersoft/get_changes.sh b/etersoft/get_changes.sh
index 5974366f1208054a41370ef2a00b8f980b9ebb9a..2366e2182f7a35559d3846868a20bced6a1fa141 100755 (executable)
--- a/etersoft/get_changes.sh
+++ b/etersoft/get_changes.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CURBRANCH=eter-1.0.9
+. ./config.in
 
 cd ..
 

diff --git a/etersoft/release_branch.sh b/etersoft/release_branch.sh
index a97204f8fce2f6d5b79c3cc6a7aac9b84e984c1a..2a2a9837381129411605bf7f256a725d87360461 100755 (executable)
--- a/etersoft/release_branch.sh
+++ b/etersoft/release_branch.sh
@@ -1,10 +1,8 @@
 #!/bin/sh
-# Script to release tarball from the branch
-ETERVERSION=1.0.9
-BRANCH=eter-$ETERVERSION
-ORIGTAG=wine-0.9.60
 
-VERSION=`date -d today "+%Y%m%d"`
+. ./config.in
+
+# Script to release tarball from the branch
 
 TEMPREPO=wine-temp-$VERSION.repo
 
@@ -16,13 +14,13 @@ cd ..
 git-clone $CURGIT $TEMPREPO || exit 1
 
 cd $TEMPREPO || exit 1
-git pull origin $BRANCH
+git pull origin $CURBRANCH
 #git-checkout $BRANCH || exit 1
 
 pure_rev=`git-rev-parse refs/tags/$ORIGTAG`
 test -n "pure_rev" || exit 1
 
-eterhack_rev=`git-rev-parse refs/remotes/origin/$BRANCH`
+eterhack_rev=`git-rev-parse refs/remotes/origin/$CURBRANCH`
 test -n "eterhack_rev" || exit 1
 
 echo "Create logs..."

diff --git a/etersoft/release_current.sh b/etersoft/release_current.sh
index 3d4d4a637310b9afa5cc76ea3b574970626f8472..a5edefe6a7fac49c27acd6d6e3de4c7ba2df24cb 100755 (executable)
--- a/etersoft/release_current.sh
+++ b/etersoft/release_current.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
+. ./config.in
+
 # Script to release tarball from the current GIT
-#VERSION=20080406
-VERSION=`date -d today "+%Y%m%d"`
 BRANCH=eterhack
 
 #TEMPREPO=~/Projects/wine-temp-$VERSION.repo

diff --git a/etersoft/update_branches.sh b/etersoft/update_branches.sh
index 91355e9dbd6ecbc31c39e47b211ec2178b2f3011..0f4a70aecc9e4bc07c5844871be0ad3360d76780 100755 (executable)
--- a/etersoft/update_branches.sh
+++ b/etersoft/update_branches.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-VERSION=`date -d today "+%Y%m%d"`
-ETERVERSION=1.0.9
-CURBRANCH=eter-$ETERVERSION
+. ./config.in
 
 # parent dir is not missed in pure
 cd ..
@@ -40,4 +38,7 @@ git commit VERSION -m "Update eterversion"
 git commit libs/wine/config.c -m "Update source version"
 # return to current branch
 git checkout master || exit 1
+echo "Autoconf..."
+autoconf -f
+git commit configure -m "Build our configure" || exit 1
 echo "All done correctly"