set up unstable windows releases again

This commit is contained in:
jriegel 2012-02-28 23:47:02 +01:00
parent ec31dba6ea
commit e0c3708ce3
5 changed files with 60 additions and 8 deletions

49
src/Tools/WinVersion.py Normal file
View File

@ -0,0 +1,49 @@
#! python
# -*- coding: utf-8 -*-
# (c) 2012 Juergen Riegel LGPL
#
# Script to create files used in Windows build
# uses SubWCRev.py for version detection#
import SubWCRev,getopt,sys,string
def main():
input=""
output="."
dir="."
try:
opts, args = getopt.getopt(sys.argv[1:], "dso:", ["dir=","src=","out="])
except getopt.GetoptError:
pass
for o, a in opts:
if o in ("-d", "--dir"):
dir = a
if o in ("-s", "--src"):
input = a
if o in ("-o", "--out"):
output = a
git = SubWCRev.GitControl()
if(git.extractInfo(input)):
print git.hash
print git.branch
print git.rev[0:4]
print git.date
print git.url
print input
print output
f = open(input,'r')
o = open(output,'w')
for line in f.readlines():
line = string.replace(line,'$WCREV$',git.rev[0:4])
line = string.replace(line,'$WCDATE$',git.date)
line = string.replace(line,'$WCURL$',git.url)
o.write(line)
if __name__ == "__main__":
main()

View File

@ -4,9 +4,12 @@ if NOT DEFINED WIXDIR set WIXDIR=C:\Program Files (x86)\Windows Installer XML v3
rem in order to build an x64 installer set PLATFORM to x64
if not defined PLATFORM set PLATFORM=x86
"C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. Version.wxi.in Version.wxi
"C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. CopyRelease.bat.in CopyRelease.bat
"C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. ..\Build\Version.h.in ..\Build\Version.h
C:\Python26\python.exe ../Tools/WinVersion.py --dir=../.. --src=Version.wxi.in --out=Version.wxi
C:\Python26\python.exe ../Tools/WinVersion.py --dir=../.. --src=CopyRelease.bat.in --out=CopyRelease.bat
C:\Python26\python.exe ../Tools/WinVersion.py --dir=../.. --src=../Build/Version.h.in --out=../Build/Version.h
rem "C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. Version.wxi.in Version.wxi
rem "C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. CopyRelease.bat.in CopyRelease.bat
rem "C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" ..\.. ..\Build\Version.h.in ..\Build\Version.h
SET /P M=Reebuild and press enter

View File

@ -1,4 +1,4 @@
copy FreeCAD.msi FreeCAD_0.12.$WCREV$_x86_unstable_setup.msi
copy FreeCAD.7z FreeCAD_0.12.$WCREV$_x86_unstable_bin.7z
copy FreeCAD.msi FreeCAD_0.13.$WCREV$_x86_unstable_setup.msi
copy FreeCAD.7z FreeCAD_0.13.$WCREV$_x86_unstable_bin.7z

View File

@ -27,9 +27,9 @@
<?define RTMProductVersion="$(var.FCVersionMajor).$(var.FCVersionMinor)" ?>
<?define ProductVersion="$(var.FCVersionMajor).$(var.FCVersionMinor).$(var.FCVersionRevision)" ?>
<!-- this is the product UID and have to change for every x.y Version -->
<?define ProductCode="{81abc4a0-de63-11de-8a39-0800200c9a66}"?>
<?define ProductCode="{2b2b5d2b-0f01-410b-843b-8f437fd75fbf}"?>
<!-- this is the product upgrade UID and have to change for every x.y Version -->
<?define UpgradeCode="{b921eb30-de63-11de-8a39-0800200c9a66}"?>
<?define UpgradeCode="{2b2b5d2b-0f01-410b-843b-8f437fd75fbf}"?>
<?define PackageCode="{????????-????-????-????-????????????}"?>

View File

@ -1,5 +1,5 @@
<Include>
<?define FCVersionMajor =0 ?>
<?define FCVersionMinor =12 ?>
<?define FCVersionMinor =13 ?>
<?define FCVersionRevision =$WCREV$ ?>
</Include>