diff --git a/BuildAll.bat b/BuildAll.bat deleted file mode 100644 index 0afcd366b2..0000000000 --- a/BuildAll.bat +++ /dev/null @@ -1,21 +0,0 @@ -@echo off -rem Build script, uses vcbuild to completetly build FreeCAD - -rem start again nice (LOW) -if "%1"=="" ( - start /WAIT /LOW /B cmd.exe /V /C %~s0 go_ahead - goto:eof -) -rem set the aprobiated Variables here or outside in the system -if NOT DEFINED VCDIR set VCDIR=C:\Program Files\Microsoft Visual Studio 9.0 - -rem Register VS Build programms -call "%VCDIR%\VC\vcvarsall.bat" - -rem "C:\Program Files\TortoiseSVN\bin\TortoiseProc.exe" /command:update /path:"C:\SW_Projects\CAD\FreeCAD_10" /closeonend:3 - - -rem Start the Visuall Studio build process -"%VCDIR%\VC\vcpackages\vcbuild.exe" FreeCAD_trunk.sln "Debug|Win32" -"%VCDIR%\VC\vcpackages\vcbuild.exe" FreeCAD_trunk.sln "Debug|Win32" -"%VCDIR%\VC\vcpackages\vcbuild.exe" FreeCAD_trunk.sln "Release|Win32" diff --git a/BuildRelease.ini b/BuildRelease.ini deleted file mode 100644 index 7084ae973e..0000000000 --- a/BuildRelease.ini +++ /dev/null @@ -1,19 +0,0 @@ -# Version of the release. The Revision number you must specify at the command line -[Version] -Major: 0 -Minor: 7 -Alias: Bespin -Url: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk - -# Here comes the paths of the needed tools to build a release -# the path can be simple or as full path. Depends if you have your tool in PATH -[Tools] -svn: C:\Program Files (x86)\Subversion\svn.exe -wget: C:\Libs\FreeCADLibs\FreeCADLibs6.2\bin\wget.exe -candle: C:\Libs\Libs\wix_30\candle.exe -light: C:\Libs\Libs\wix_30\light.exe -hhc: C:\Program Files (x86)\HTML Help Workshop\hhc.exe - -# needet until the build is completely done with cMake -[Libs] # Libs used in the build -FreecadLib: C:\Libs\FreeCADLibs\FreeCADLibs6.2 \ No newline at end of file diff --git a/BuildRelease.py b/BuildRelease.py deleted file mode 100644 index 554d5551fa..0000000000 --- a/BuildRelease.py +++ /dev/null @@ -1,342 +0,0 @@ -#! python -# -*- coding: utf-8 -*- -# (c) 2007 Jürgen Riegel GPL - -Usage = """BuildRelease - Build script to build a complete FreeCAD release - -Usage: - BuildRelease [Optionen] ReleaseNbr - -Options: - -h, --help print this help - -b, --buildPath specify the output path where the build takes place - -i, --ini-file specify the ini file to use - -This script will build a complete FreeCAD distribution which includes: -* Check out fresh source -* packing source -* Set the Version and Release numbers -* Gathering change log -* completele build FreeCAD -* run tests -* build source docu -* build user docu -* build installer -* upload to source forge - -On failure of one of these steps the script will stop. -Each step writes tones of info in the log file. -There is one error log file. - -Autor: - (c) 2007 Juergen Riegel - juergen.riegel@web.de - Licence: GPL - -Version: - 0.1 -""" -# -# Its inteded only to used by the maintainer - -import os, sys, getopt -from subprocess import call,Popen,PIPE -from time import sleep -from zipfile import ZipFile,ZIP_DEFLATED -import tarfile -from string import find -import ConfigParser -import time - - -# global information -Release = 0 -Major = 0 -Minor = 7 -Alias = "" -FileName = "" -BuildPath = "D:/ReleaseBuilds" -Log = None -ErrLog = None -Config = None - - -def CallProcess(args,Msg,ret=True): - Anim = ['-','\\','|','/'] - - sys.stdout.write(Msg+': ') - Log.write("====== Call: " + args[0] + '\n') - SVN = Popen(args, - stdout=PIPE, stderr = ErrLog) - - i = 0 - while(SVN.poll() == None): - line = SVN.stdout.readline() - if(line): - Log.write(line.replace('\n','')) - sys.stdout.write(chr(8) + Anim[i%4]) - i+=1 - sleep(0.2) - - #ErrLog.write(SVN.stdout.read()) - sys.stdout.write(chr(8) + "done\n") - if(not SVN.returncode == 0 and ret): - print "Process returns: ",SVN.returncode - raise - -# Step 2 & 3 -def CheckOut(): - - CallProcess([Config.get('Tools','svn'), - "checkout", - "-r", - `Release`, - "https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk", - "../"+FileName], - "2) Checking out") - - sys.stdout.write('3) Write version files: ') - - Version = open("src/Build/Version.h","w") - Version.write('#define FCVersionMajor "' + `Major` + '"\n') - Version.write('#define FCVersionMinor "' + `Minor` + '"\n') - Version.write('#define FCVersionName "' + Alias + '"\n') - Version.write('#define FCRevision "' + `Release` + '"\n') - Version.write('#define FCRepositoryURL "' + "https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk/src" + '"\n') - Version.write('#define FCCurrentDateT "'+time.asctime()+'" \n') - Version.close() - - Version = open("installer/Version.wxi","w") - Version.write(' \n') - Version.write(' \n') - Version.write(' \n') - Version.write(' \n') - Version.write(' \n') - Version.write(' \n') - Version.close() - - sys.stdout.write('done\n') - - -#Step 4 -def PackSourceZip(): - - def addAll(dirFrom, ZipSrcFile): - for file in os.listdir(dirFrom): # for files/dirs here - if(not file==".svn" and not file== FileName+'_source.zip'): - pathFrom = os.path.join(dirFrom, file) - if not os.path.isdir(pathFrom): # copy simple files - ZipSrcFile.write(pathFrom,pathFrom.replace('.\\',FileName+'\\')) - Log.write("Insert: "+ pathFrom + '\n') - else: - addAll(pathFrom,ZipSrcFile) - - sys.stdout.write("4) Pack zip source files: ") - - SourceFile = ZipFile(FileName+'_source.zip','w',ZIP_DEFLATED,True) - addAll('.',SourceFile) - SourceFile.close() - - sys.stdout.write("done \n") - -# Step 5 -def PackSourceTar(): - - def addAll(dirFrom, ZipTarFile): - for file in os.listdir(dirFrom): # for files/dirs here - if(not file==".svn" and not file== FileName+'_source.zip'): - pathFrom = os.path.join(dirFrom, file) - if not os.path.isdir(pathFrom): # copy simple files - ZipTarFile.add(pathFrom,pathFrom.replace('.\\',FileName+'\\')) - Log.write("Insert: "+ pathFrom + '\n') - else: - addAll(pathFrom,ZipTarFile) - - sys.stdout.write("5) Pack tar source files: ") - - SourceFile = tarfile.open(FileName+'_source.tgz','w:gz') - addAll('.',SourceFile) - SourceFile.close() - - sys.stdout.write("done \n") - - -# Step 6 & 7 -def BuildAll(): - import fcbt.FileTools - LibPack = Config.get('Libs','FreeCADLib') - - sys.stdout.write('6) Copy resources: ') - os.mkdir('./bin') - fcbt.FileTools.cpall(LibPack + '/bin','./bin') - os.mkdir('./include') - fcbt.FileTools.cpall(LibPack + '/include','./include') - os.mkdir('./lib') - fcbt.FileTools.cpall(LibPack + '/lib','./lib') - os.mkdir('./doc') - fcbt.FileTools.cpall(LibPack + '/doc','./doc') - sys.stdout.write('done\n') - - CallProcess(["BuildAll.bat"], - "7) Build all") - -# Step 8 & 9 -def HelpFile(): - import wiki2chm - if not os.path.isdir('doc'): - os.mkdir('doc') - if not os.path.isdir('doc/tmp'): - os.mkdir('doc/tmp') - - CallProcess([Config.get('Tools','wget'),'-k', '-r', '-l5', '-P', 'doc/tmp', '-nd', - '-R', '*action=*', - '-R', '*title=Special*', - '-R', '*title=Talk*', - '-R', '*oldid=*', - '-R', '*printable=yes*', - '--domains=apps.sourceforge.net', - '--append-output=doc/tmp/wget.log', - 'http://apps.sourceforge.net/mediawiki/free-cad/index.php?title=Online_Help_Toc'], - "8) Download docu") - - sys.stdout.write("9) Fix up CSS: ") - open('doc/tmp/chm.css','w').write(open('src/Tools/chm.css').read()) - - wiki2chm.WikiBaseUrl ='http://apps.sourceforge.net/mediawiki/free-cad/' - wiki2chm.TocPageName ='Online_Help_Toc' - wiki2chm.BasePath ='doc/tmp/' - wiki2chm.Output = Log - - wiki2chm.replaceCSS() - - wiki2chm.WriteProject() - wiki2chm.readToc() - sys.stdout.write("done \n") - -# Step 10 -def CompileHelp(): - import fcbt.FileTools - CallProcess([Config.get('Tools','hhc'),'doc/tmp/Online_Help_Toc.hhp'],'10)Compile help:',False) - fcbt.FileTools.cpfile('doc/tmp/FreeCAD.chm','doc/FreeCAD.chm') - fcbt.FileTools.cpfile('doc/tmp/FreeCAD.chm',FileName+'_helpfile.chm') - -def BuildInstaller(): - import fcbt.FileTools - LibPack = Config.get('Libs','FreeCADLib') - - fcbt.FileTools.cpfile('lib/Microsoft_VC80_CRT_x86.msm','installer/Microsoft_VC80_CRT_x86.msm') - fcbt.FileTools.cpfile('lib/policy_8_0_Microsoft_VC80_CRT_x86.msm','installer/policy_8_0_Microsoft_VC80_CRT_x86.msm') - CallProcess([Config.get('Tools','candle'), - '-out', 'installer\\', - 'installer\\FreeCAD.wxs', - 'installer\\FreeCADBase.wxs', - 'installer\\LibPack.wxs', - 'installer\\FreeCADDoc.wxs', - 'installer\\FreeCADModules.wxs', - ],'11)Compile installer:',False) - CallProcess([Config.get('Tools','light'), - '-ext', 'WixUIExtension', - '-cultures:en-us', - '-out', 'installer\\FreeCAD.msi', - 'installer\\FreeCAD.wixobj', - 'installer\\FreeCADBase.wixobj', - 'installer\\LibPack.wixobj', - 'installer\\FreeCADDoc.wixobj', - 'installer\\FreeCADModules.wixobj', - ],'12)Build installer:',False) - - fcbt.FileTools.cpfile('installer/FreeCAD.msi',FileName+'_installer.msi') - -def SendFTP(): - from ftplib import FTP - ftp = FTP('upload.sf.net') - Log.write(ftp.login() + '\n') - Log.write(ftp.cwd("/incoming") + '\n') - Log.write(ftp.sendcmd('PASV') + '\n') - Log.write(ftp.sendcmd('TYPE I') + '\n') - sys.stdout.write('13) Send source ZIP: ') - f = open(FileName+'_source.zip', "r") - Log.write(ftp.storbinary('STOR '+ FileName+'_source.zip', f) + '\n') - sys.stdout.write('done\n14) Send source tgz: ') - f = open(FileName+'_source.tgz', "r") - Log.write(ftp.storbinary('STOR '+ FileName+'_source.tgz', f) + '\n') - sys.stdout.write('done\n15) Send installer: ') - f = open(FileName+'_installer.msi', "r") - Log.write(ftp.storbinary('STOR '+ FileName+'_installer.msi', f) + '\n') - f.close() - ftp.close() - -def main(): - global Release, Major, Minor, Alias, FileName, BuildPath, Log, ErrLog, Config - IniFile = "BuildRelease.ini" - try: - opts, args = getopt.getopt(sys.argv[1:], "hb:", ["help","buildPath="]) - except getopt.GetoptError: - # print help information and exit: - sys.stderr.write(Usage) - sys.exit(2) - - # checking on the options - for o, a in opts: - if o in ("-h", "--help"): - sys.stderr.write(Usage) - sys.exit() - if o in ("-b", "--buildPath"): - BuildPath = a - if o in ("-i", "--ini-file"): - IniFile = a - - - # runing through the files - if (not len(args) == 1): - sys.stderr.write(Usage) - - Release = int(args[0]) - - Config = ConfigParser.ConfigParser() - Config.readfp(open(IniFile)) - - Alias = Config.get('Version','Alias') - Major = Config.getint('Version','Major') - Minor = Config.getint('Version','Minor') - - # creating the directory and switch to - FileName = 'FreeCAD_' + `Major` + '.' + `Minor` + '.' + `Release` - print "=== Building:", FileName, '\n' - BuildPath = BuildPath + '/' + FileName - # set tool path - sys.path.append((BuildPath + '/src/Tools') ) - OldCwd = os.getcwd() - print "1) Creating Build directory: ", BuildPath - if not os.path.isdir(BuildPath): - os.mkdir(BuildPath) - os.chdir(BuildPath) - Log = open("BuildRelease.log","w") - ErrLog = open("BuildReleaseErrors.log","w") - - try: - CheckOut() - PackSourceZip() - PackSourceTar() - BuildAll() - HelpFile() - CompileHelp() - BuildInstaller() - #SendFTP() - except: - Log.close() - ErrLog.close() - Err = open("BuildReleaseErrors.log","r") - sys.stderr.write("!!!!!!!!! Fehler aufgetreten:\n") - sys.stderr.write(Err.read()) - raise - - os.chdir(OldCwd) - Log.close() - ErrLog.close() - - print "Press any key" - sys.stdin.readline() - -if __name__ == "__main__": - main() diff --git a/src/Tools/WixFileTool.py b/src/Tools/WixFileTool.py deleted file mode 100644 index 9665354b43..0000000000 --- a/src/Tools/WixFileTool.py +++ /dev/null @@ -1,33 +0,0 @@ -#! python -# (c) 2005 Juergen Riegel LGPL - -Usage = """ -WIX file lister -Usage: - WixFileTool [Optionen] srcDir destDir -Optionen: - -Author: - (c) 2005 Juergen Riegel - juergen.riegel@web.de - -Version: - 0.1 -""" - -import os,sys,string,re,glob - -def ProcessDir(dummy,dirname,filesindir): - print dirname - -if __name__ == '__main__': - if(len(sys.argv) < 3): - sys.stdout.write(Usage) - sys.exit(1) - else: - i=0 - for name in glob.glob(sys.argv[1]): - i=i+1 - print "" % (i,i,name,sys.argv[2]) - - diff --git a/src/Tools/wiki2chm.py b/src/Tools/wiki2chm.py deleted file mode 100644 index c8b179a263..0000000000 --- a/src/Tools/wiki2chm.py +++ /dev/null @@ -1,254 +0,0 @@ -#! python -# -*- coding: utf-8 -*- -# (c) 2007 Juergen Riegel LGPL - -Usage = """wiki2chm - connect to a wiki and spider the docu - -Usage: - wiki2chm [Options] WikiBaseUrl TocPageName - -Options: - -p, --proxy=ProxyUrl specify a proxy - -o --out-path=BASEPATH use this base path to the HTML project - -h, --help print this help - -w, --wget-path=WGETPATH full path to wget (if not in system path) - -Exit: - 0 No Error or Warning found - 1 Argument error, wrong or less Arguments given - 2 Run delivers Warnings (printed on standard error) - 10 Run stops with an error (printed on standard error) - -This program reads the wiki and generates all necessary files -to generate a .chm file. -The TocPageName is a special page in the Wiki, which is used -to generate the content for the .chm. - -Examples: - - wiki2chm "http://juergen-riegel.net/FreeCAD/Docu/" Online_Help_Toc - wiki2chm -w "C:/Libs/FreeCADLibs/FreeCADLibs6.1/bin/wget.exe" "http://juergen-riegel.net/FreeCAD/Docu/" Online_Help_Toc - -Autor: - (c) 2007-2008 Juergen Riegel - mail@juergen-riegel.net - Licence: GPL - -Version: - 0.3 -""" - -import os,sys,string,re,getopt,codecs,binascii,datetime,urllib,glob,time - - -# Globals -Woff = 0 - -proxies = {} -WikiBaseUrl = "" -TocPageName = "" -FetchedArticels =[] -BasePath = "" -Wget = "wget" - -hhcHeader = """ - - - - - - - -""" -ProjectFile = """ -[OPTIONS] -Compatibility=1.1 or later -Compiled file=FreeCAD.chm -Contents file=Online_Help_Toc.hhc -Default topic=index.php@title=Online_Help_Startpage -Display compile progress=Yes -Full-text search=Yes -Language=0x409 Englisch (USA) -[FILES] - -""" -Output = sys.stdout - -def runWget(): - global Wget - cmdLine = Wget + " " - cmdLine += "-k -r " # convert to local links and do recursive - cmdLine += "-P tmp " # write in this subdir - cmdLine += "-nd " # flat (no subdirs) - cmdLine += "-l5 " # max link follow depth - cmdLine += '-R "*action=*" ' # Reject all action links - cmdLine += '-R "*title=Special*" '# Reject all special pages - cmdLine += '-R "*title=Talk*" ' # Reject all Talk pages - cmdLine += '-R "*oldid=*" ' # Reject all history pages - cmdLine += '-R "*printable=yes*" '# Reject all print pages - cmdLine += 'http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Online_Help_Toc ' - - result = os.popen(cmdLine).read() - print result - - -def getArticle(Name): - global proxies,WikiBaseUrl,TocPageName,BasePath - - url = WikiBaseUrl + 'index.php?title=' + Name.replace(" ","_") + '&printable=yes' - - print "GetFile: " + url - - urlFile = urllib.urlopen(url,proxies=proxies) - Article = urlFile.readlines() - file = open(BasePath + Name.replace(" ","_") + ".htm","w") - for i in Article: - i = i.replace("/FreeCAD/Docu/skins/common/commonPrint.css","test.css") - file.write(i) - file.close() - -def insertTocEntry(file,Indent,points,name,folder=0): - Output.write( "TocEntry:" + `Indent` + ' ' + name) - name = name.replace("\n","") - IndentStr = "" - for i in range(points):IndentStr += " " - - if(points > Indent): - for i in range(points-Indent): - file.write("") - file.write("\n") - file.write(IndentStr + '
  • \n') - file.write(IndentStr + ' \n') - if(not folder): - file.write(IndentStr + ' \n') - file.write(IndentStr + ' \n') - return points - -def readToc(): - global proxies,WikiBaseUrl,TocPageName,BasePath - - url = WikiBaseUrl + 'index.php?title=Special:Export/' + TocPageName - Output.write( 'Open Toc url: ' + url + '\n') - urlFile = urllib.urlopen(url,proxies=proxies) - Toc = urlFile.readlines() - - # compile the regexes needed - Toc1 = re.compile("^(\*+)\s([\w|\s]*)") - Toc2 = re.compile("^(\*+)\s\[\[([\w|\s]*)\|([\w|\s]*)\]\]") - Toc3 = re.compile("^(\*+)\s\[\[([\w|\s]*)\\]\]") - - file = open(BasePath + TocPageName +".hhc","w") - file.write(hhcHeader) - ListIndent = 1 - - for line in Toc: - #print line - TocMatch = Toc2.search(line); - if TocMatch: - #print "Match2: ", TocMatch.group(1),TocMatch.group(2),TocMatch.group(3) - #getArticle(TocMatch.group(2)) - ListIndent = insertTocEntry(file,ListIndent,len(TocMatch.group(1)),TocMatch.group(2)) - continue - TocMatch = Toc3.search(line); - if TocMatch: - #print "Match3: ", TocMatch.group(1),TocMatch.group(2) - #getArticle(TocMatch.group(2)) - ListIndent = insertTocEntry(file,ListIndent,len(TocMatch.group(1)),TocMatch.group(2)) - continue - TocMatch = Toc1.search(line); - if TocMatch: - #print "Match1: ", TocMatch.group(1),TocMatch.group(2) - ListIndent = insertTocEntry(file,ListIndent,len(TocMatch.group(1)),TocMatch.group(2),1) - continue - for i in range(ListIndent-1): - file.write("") - file.write("\n") - - file.write(hhcFooter) - -def WriteProject(): - global proxies,WikiBaseUrl,TocPageName,BasePath - - file = open(BasePath + TocPageName +".hhp","w") - file.write(ProjectFile) - - for FileEntry in os.listdir(BasePath) : - if(not FileEntry == TocPageName +".hhp"): - file.write(FileEntry + '\n') - - file.close() - -def replaceCSS(): - paths = glob.glob(BasePath + 'index.php*') - for file in paths: - Output.write( "Replace: " +file + '\n') - input = open(file,'r') - output = open(file + '_temp','w') - for l in input: - output.write(l.replace('"/FreeCAD/Docu/skins/monobook/main.css?9"','"chm.css"')) - output.close() - input.close() - time.sleep(0.2) - os.remove(file) - time.sleep(0.2) - os.rename(file + '_temp',file) - -def main(): - global proxies,WikiBaseUrl,TocPageName,BasePath, Wget - Proxy = "" - Qout = None - DFQout = None - CSVout = None - NoOut = 0 - - try: - opts, args = getopt.getopt(sys.argv[1:], "hw:p:o:", ["help", "weget-path=", "proxy=","out-path="]) - except getopt.GetoptError: - # print help information and exit: - sys.stderr.write(Usage) - sys.exit(2) - - # checking on the options - for o, a in opts: - if o == "-v": - verbose = True - if o in ("-h", "--help"): - sys.stderr.write(Usage) - sys.exit() - if o in ("-w", "--weget-path"): - Wget = a - if o in ("-p", "--proxy"): - Proxy = a - if o in ("-o", "--out-path"): - print "Using output path: " + a +"\n" - BasePath = a - - # runing through the files - if(Proxy == ""): - proxies = {} - print 'Using no proxy' - else: - proxies = {'http':Proxy} - print 'Using proxy: ' + Proxy - - if (len(args) !=2): - sys.stderr.write("Wrong number of arguments!\n\n") - sys.stderr.write(Usage) - sys.exit(2) - else: - WikiBaseUrl = args[0] - TocPageName = args[1] - runWget() - readToc() - WriteProject() - - - -if __name__ == "__main__": - main() diff --git a/src/WindowsInstaller/BuildInstaller.bat b/src/WindowsInstaller/BuildInstaller.bat deleted file mode 100644 index 04fc554c77..0000000000 --- a/src/WindowsInstaller/BuildInstaller.bat +++ /dev/null @@ -1,32 +0,0 @@ - -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:\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 - -"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCADBase.wxobj FreeCADBase.wxs -"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out LibPack.wxobj LibPack.wxs -"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCADDoc.wxobj FreeCADDoc.wxs -"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCADModules.wxobj FreeCADModules.wxs -"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCADData.wxobj FreeCADData.wxs -"%WIXDIR%\bin\candle.exe" -dProcessorArchitecture=%PLATFORM% -out FreeCAD.wxobj FreeCAD.wxs - -"%WIXDIR%\bin\light.exe" -dWixUIBannerBmp=Bitmaps/BanerBitmap.bmp -dWixUIDialogBmp=Bitmaps/BackgroundBitmap.bmp -ext WixUIExtension -sice:ICE03 -sice:ICE60 -sice:ICE82 -sice:ICE83 -cultures:en-us -out FreeCAD.msi *.wxobj - -rem making of the bin zip file - -"%PROGRAMFILES%\7-Zip\7z.exe" a -t7z FreeCAD.7z "-xr!*.idb" "-xr!*.pdb" "-xr!*.ilk" "-xr!*.pyc" "-xr!?.git\*" "-xr!*.am" "-xr!CMakeFiles" "..\..\bin" "..\..\Mod" "..\..\Doc" "..\..\data" - -call CopyRelease.bat - -del FreeCAD.7z -del FreeCAD.msi \ No newline at end of file diff --git a/src/WindowsInstaller/BuildRelease.bat b/src/WindowsInstaller/BuildRelease.bat deleted file mode 100644 index 4e8820fde8..0000000000 --- a/src/WindowsInstaller/BuildRelease.bat +++ /dev/null @@ -1,13 +0,0 @@ - -rem set up Version Number -call ..\src\Build\BuildVersion.bat - -rem Build FreeCAD -call ..\BuildAll.bat - -rem installer -call BuildInstaller.bat - -@pause - - diff --git a/src/WindowsInstaller/CopyRelease.bat.in b/src/WindowsInstaller/CopyRelease.bat.in deleted file mode 100644 index 91d6e23308..0000000000 --- a/src/WindowsInstaller/CopyRelease.bat.in +++ /dev/null @@ -1,4 +0,0 @@ - - -copy FreeCAD.msi FreeCAD_0.14.$WCREV$_x86_RC_setup.msi -copy FreeCAD.7z FreeCAD_0.14.$WCREV$_x86_RC_bin.7z \ No newline at end of file diff --git a/src/WindowsInstaller/FreeCAD.wxs b/src/WindowsInstaller/FreeCAD.wxs deleted file mode 100644 index 1009899f3f..0000000000 --- a/src/WindowsInstaller/FreeCAD.wxs +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Greatest CAD ever ;-) - Juergen Riegel (FreeCAD@juergen-riegel.net) - http://sourceforge.net/forum/forum.php?forum_id=161659 - http://www.freecadweb.org/ - https://sourceforge.net/projects/free-cad/files/ - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FreeCADIcon - - - - - - - NEWPRODUCTFOUND - - - - NEWPRODUCTFOUND - - - - diff --git a/src/WindowsInstaller/FreeCADBase.wxs b/src/WindowsInstaller/FreeCADBase.wxs deleted file mode 100644 index 4209becc53..0000000000 --- a/src/WindowsInstaller/FreeCADBase.wxs +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/FreeCADData.wxs b/src/WindowsInstaller/FreeCADData.wxs deleted file mode 100644 index d612951df7..0000000000 --- a/src/WindowsInstaller/FreeCADData.wxs +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/FreeCADDoc.wxs b/src/WindowsInstaller/FreeCADDoc.wxs deleted file mode 100644 index 819e3044aa..0000000000 --- a/src/WindowsInstaller/FreeCADDoc.wxs +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/FreeCADModules.wxs b/src/WindowsInstaller/FreeCADModules.wxs deleted file mode 100644 index e0698d53d0..0000000000 --- a/src/WindowsInstaller/FreeCADModules.wxs +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/LibPack.wxs b/src/WindowsInstaller/LibPack.wxs deleted file mode 100644 index 007f69a338..0000000000 --- a/src/WindowsInstaller/LibPack.wxs +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/LibPackDll.wxi b/src/WindowsInstaller/LibPackDll.wxi deleted file mode 100644 index f35d72c0de..0000000000 --- a/src/WindowsInstaller/LibPackDll.wxi +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModArch.wxi b/src/WindowsInstaller/ModArch.wxi deleted file mode 100644 index 5930742135..0000000000 --- a/src/WindowsInstaller/ModArch.wxi +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/ModCam.wxi b/src/WindowsInstaller/ModCam.wxi deleted file mode 100644 index 9e7e0111a0..0000000000 --- a/src/WindowsInstaller/ModCam.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModComplete.wxi b/src/WindowsInstaller/ModComplete.wxi deleted file mode 100644 index 616be9f154..0000000000 --- a/src/WindowsInstaller/ModComplete.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModDraft.wxi b/src/WindowsInstaller/ModDraft.wxi deleted file mode 100644 index a80dd345ef..0000000000 --- a/src/WindowsInstaller/ModDraft.wxi +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/ModDrawing.wxi b/src/WindowsInstaller/ModDrawing.wxi deleted file mode 100644 index 7060491bba..0000000000 --- a/src/WindowsInstaller/ModDrawing.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModFem.wxi b/src/WindowsInstaller/ModFem.wxi deleted file mode 100644 index 8cd54486fb..0000000000 --- a/src/WindowsInstaller/ModFem.wxi +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModImage.wxi b/src/WindowsInstaller/ModImage.wxi deleted file mode 100644 index 7e4dabd0d8..0000000000 --- a/src/WindowsInstaller/ModImage.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModImport.wxi b/src/WindowsInstaller/ModImport.wxi deleted file mode 100644 index 3801da17fa..0000000000 --- a/src/WindowsInstaller/ModImport.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModInspection.wxi b/src/WindowsInstaller/ModInspection.wxi deleted file mode 100644 index 085b3e65ad..0000000000 --- a/src/WindowsInstaller/ModInspection.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModMesh.wxi b/src/WindowsInstaller/ModMesh.wxi deleted file mode 100644 index 5fb14028cf..0000000000 --- a/src/WindowsInstaller/ModMesh.wxi +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModMeshPart.wxi b/src/WindowsInstaller/ModMeshPart.wxi deleted file mode 100644 index fb19c39061..0000000000 --- a/src/WindowsInstaller/ModMeshPart.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModOpenSCAD.wxi b/src/WindowsInstaller/ModOpenSCAD.wxi deleted file mode 100644 index def24ebbed..0000000000 --- a/src/WindowsInstaller/ModOpenSCAD.wxi +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/ModPart.wxi b/src/WindowsInstaller/ModPart.wxi deleted file mode 100644 index eb5803e12b..0000000000 --- a/src/WindowsInstaller/ModPart.wxi +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModPartDesign.wxi b/src/WindowsInstaller/ModPartDesign.wxi deleted file mode 100644 index 03e1905f19..0000000000 --- a/src/WindowsInstaller/ModPartDesign.wxi +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModPlot.wxi b/src/WindowsInstaller/ModPlot.wxi deleted file mode 100644 index f536a491dc..0000000000 --- a/src/WindowsInstaller/ModPlot.wxi +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/ModPoints.wxi b/src/WindowsInstaller/ModPoints.wxi deleted file mode 100644 index 6fc6f963fd..0000000000 --- a/src/WindowsInstaller/ModPoints.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModRaytracing.wxi b/src/WindowsInstaller/ModRaytracing.wxi deleted file mode 100644 index 69c4fe232d..0000000000 --- a/src/WindowsInstaller/ModRaytracing.wxi +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModRobot.wxi b/src/WindowsInstaller/ModRobot.wxi deleted file mode 100644 index 932f8a8d93..0000000000 --- a/src/WindowsInstaller/ModRobot.wxi +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModShip.wxi b/src/WindowsInstaller/ModShip.wxi deleted file mode 100644 index 6c863a5767..0000000000 --- a/src/WindowsInstaller/ModShip.wxi +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WindowsInstaller/ModSketcher.wxi b/src/WindowsInstaller/ModSketcher.wxi deleted file mode 100644 index 4714d886f2..0000000000 --- a/src/WindowsInstaller/ModSketcher.wxi +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModStart.wxi b/src/WindowsInstaller/ModStart.wxi deleted file mode 100644 index c730abb85b..0000000000 --- a/src/WindowsInstaller/ModStart.wxi +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModTest.wxi b/src/WindowsInstaller/ModTest.wxi deleted file mode 100644 index d9fef93de1..0000000000 --- a/src/WindowsInstaller/ModTest.wxi +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/ModWeb.wxi b/src/WindowsInstaller/ModWeb.wxi deleted file mode 100644 index b3af0e286b..0000000000 --- a/src/WindowsInstaller/ModWeb.wxi +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/WindowsInstaller/Version.wxi.in b/src/WindowsInstaller/Version.wxi.in deleted file mode 100644 index d2cfcd6e58..0000000000 --- a/src/WindowsInstaller/Version.wxi.in +++ /dev/null @@ -1,5 +0,0 @@ - - - - -