X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=maketgz;h=bc19142446beccf2ba6d9c5ee2cc7a79f19c0159;hb=c77f77a1ce2e00f3db59e8337268325f879908fb;hp=6ad429b5d76821660e0d9ac4cd03419c5688616a;hpb=ae1912cb0d494b48d514d937826c9fe83ec96c4d;p=platform%2Fupstream%2Fcurl.git

diff --git a/maketgz b/maketgz
index 6ad429b..bc19142 100755
--- a/maketgz
+++ b/maketgz
@@ -7,15 +7,24 @@ read version
 
 libversion="$version"
 
+#
+# Now we have a section to get the major, minor and patch number from the
+# full version string. We create a single hexadecimal number from it '0xMMmmpp'
+#
+perl='$a=<STDIN>;@p=split("[\\.-]",$a);for(0..2){printf STDOUT ("%02x",$p[0+$_]);}';
+
+numeric=`echo $libversion | perl -e "$perl"`
+
 echo "CURL version number?"
 read curlversion
 
 HEADER=include/curl/curl.h
 CHEADER=src/version.h
 
-
 # Replace version number in header file:
-sed 's/#define LIBCURL_VERSION.*/#define LIBCURL_VERSION "'$libversion'"/g' $HEADER >$HEADER.new
+sed -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION "'$libversion'"/g' \
+    -e 's/^#define LIBCURL_VERSION_NUM .*/#define LIBCURL_VERSION_NUM 0x'$numeric'/g' \
+ $HEADER >$HEADER.new
 
 # Save old header file
 cp -p $HEADER $HEADER.old
@@ -49,29 +58,10 @@ findprog()
 
 ############################################################################
 #
-# If we have autoconf we can just as well update configure.in to contain our
-# brand new version number:
+# Enforce a rerun of configure (updates the VERSION)
 #
- 
-if { findprog autoconf >/dev/null 2>/dev/null; } then
-  echo "- No autoconf found, we leave configure as it is"
-else
-  # Replace version number in configure.in file:
-
-  CONF="configure.in"
-
-  sed 's/^AM_INIT_AUTOMAKE.*/AM_INIT_AUTOMAKE(curl,"'$version'")/g' $CONF >$CONF.new
 
-  # Save old  file
-  cp -p $CONF $CONF.old
-
-  # Make new configure.in
-  mv $CONF.new $CONF
- 
-  # Update the configure script
-  echo "Runs autoconf"
-  autoconf
-fi
+#./config.status --recheck
 
 ############################################################################
 #
@@ -83,70 +73,12 @@ if { findprog automake >/dev/null 2>/dev/null; } then
   echo "- Could not find or run automake, I hope you know what you're doing!"
 else
   echo "Runs automake --include-deps"
-  automake --include-deps
+  automake --include-deps Makefile
 fi
 
 ############################################################################
 #
-# Now run make first to make the file dates decent and make sure that it
-# compiles just before release!
+# Now run make dist
 #
 
-make
-
-# get current dir
-dir=`pwd`
-
-# Get basename
-orig=`basename $dir`
-
-# Get the left part of the dash (-)
-new=`echo $orig | cut -d- -f1`
-
-# Build new directory name
-n=$new-$version;
-
-# Tell the world what we're doing
-echo "Copying files into distribution archive";
-
-if [ -r $n ]; then
-  echo "Directory already exists!"
-  exit
-fi
-
-# Create the new dir
-mkdir $n
-
-# Copy all relevant files, with path and permissions!
-tar -cf - `cat FILES` | (cd $n; tar -xBpf -)
-
-# Create the distribution root Makefile from Makefile.dist
-cp -p Makefile.dist $n/Makefile
-
-############################################################################
-#
-# Replace @SHELL@ with /bin/sh in the Makefile.in files!
-#
-echo "Replace @SHELL@ with /bin/sh in the Makefile.in files"
-temp=/tmp/curl$$
-for file in Makefile.in lib/Makefile.in src/Makefile.in; do
-  in="$n/$file"
-  sed "s:@SHELL@:/bin/sh:g" $in >$temp
-  cp $temp $in
-done
-rm -rf $temp
-
-# Tell the world what we're doing
-echo "creates $n.tar.gz";
-
-# Make a tar archive of it all
-tar -cvf $n.tar $n
-
-# gzip the archive
-gzip $n.tar
-
-# Make it world readable
-chmod a+r $n.tar.gz ;
-
-# Delete the temp dir
-rm -rf $n
+make dist