Update release script

Kissaki · Dec 4, 2010 · c0bf2c2 · c0bf2c2
1 parent 012dfc6
commit c0bf2c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/scripts/release.pl b/scripts/release.pl
@@ -75,7 +75,7 @@ ($$)
             $vdir =~ s/-build/-src/;
             push @vpath, $vdir.'libcelt/';
           } else {
-            push @vpath,map { "$basedir$_/"} split(/\s/, $value);
+            push @vpath,map { "$basedir$_/"} map { s/\$\$PWD/./; $_;} split(/\s/, $value);
           }
         }
         case "subdirs" {
@@ -132,7 +132,7 @@ ($$)
 }
 
 my @fulldirs = ('speex','speex/include/speex','speex/libspeex','man');
-foreach my $cver ('0.7.0') {
+foreach my $cver ('0.7.0', '0.9.0') {
   push @fulldirs, "celt-$cver-src";
   push @fulldirs, "celt-$cver-src/libcelt";
 }
@@ -152,10 +152,10 @@ ($$)
 delete($files{'LICENSE'});
 
 if ($#ARGV < 0) {
-  open(F, "git rev-parse --short=6 origin|"); 
+  open(F, "git describe origin|"); 
   while (<F>) {
     chomp();   
-    $ver .= "~" . strftime("%Y%m%d%H%M",gmtime()) . "-" . $_;
+    $ver = $_;
   }
   close(F);
   print "REVISION $ver\n";

diff --git a/src/mumble.pri b/src/mumble.pri
@@ -7,7 +7,7 @@ DEFINES		*= MUMBLE_VERSION_STRING=$$VERSION
 INCLUDEPATH	+= $$PWD .
 VPATH		+= $$PWD
 HEADERS		*= ACL.h Group.h Channel.h Connection.h User.h Net.h
-SOURCES 	*= Mumble.pb.cc ACL.cpp Group.cpp Channel.cpp Connection.cpp User.cpp Timer.cpp CryptState.cpp OSInfo.cpp Net.cpp SSL.cpp ../Version.cpp
+SOURCES 	*= Mumble.pb.cc ACL.cpp Group.cpp Channel.cpp Connection.cpp User.cpp Timer.cpp CryptState.cpp OSInfo.cpp Net.cpp SSL.cpp Version.cpp
 PROTOBUF	*= ../Mumble.proto
 
 pb.output = ${QMAKE_FILE_BASE}.pb.cc