From e7c3a3e03f1215e11f8a517396bdf6128a52c4f8 Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Sun, 4 May 2008 15:49:03 +0400
Subject: [PATCH] use config.in with common params

---
 etersoft/build_wine.sh      |  2 +-
 etersoft/config.in          |  5 +++++
 etersoft/create_branches.sh |  4 ++--
 etersoft/get_changes.sh     |  2 +-
 etersoft/release_branch.sh  | 12 +++++-------
 etersoft/release_current.sh |  4 ++--
 etersoft/update_branches.sh |  7 ++++---
 7 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 etersoft/config.in

diff --git a/etersoft/build_wine.sh b/etersoft/build_wine.sh
index 40eca18e74..682523a9ee 100755
--- 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
index 0000000000..54fd94bef1
--- /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 cfdfe13494..7719dd3b06 100755
--- 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 5974366f12..2366e2182f 100755
--- 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 a97204f8fc..2a2a983738 100755
--- 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 3d4d4a6373..a5edefe6a7 100755
--- 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 91355e9dbd..0f4a70aecc 100755
--- 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"
-- 
2.33.8