From ed86e2233cbca47536382b3c092a65e0f62690c7 Mon Sep 17 00:00:00 2001 From: Rick Gutleber Date: Tue, 23 Jan 2024 23:00:59 -0500 Subject: [PATCH] closing in on getting a working installer --- .gitignore | 6 +- BackupRPN.bat | 3 +- buildRPNExecutable.bat | 21 +------ buildRPNInstaller.bat | 20 +++---- buildRPN.bat => buildRPNWheel.bat | 0 rpn.spec | 37 ++++++++++++ rpn/rpn.py | 8 ++- rpn/util/rpnUtils.py | 2 +- rpn32.iss | 83 --------------------------- rpn64.iss | 77 ++++++++++--------------- setup_rpn.py | 95 ------------------------------- 11 files changed, 85 insertions(+), 267 deletions(-) rename buildRPN.bat => buildRPNWheel.bat (100%) create mode 100644 rpn.spec delete mode 100644 rpn32.iss delete mode 100644 setup_rpn.py diff --git a/.gitignore b/.gitignore index 4566aebe..30f7ddd6 100644 --- a/.gitignore +++ b/.gitignore @@ -226,7 +226,6 @@ rpn/rpndata/rpnChilada_user_functions.cfg.backup rpn/rpndata/rpnChilada_user_functions.cfg # obsolete Skyfield data files - rpn/rpndata/de405.bsp rpn/rpndata/de421.bsp rpn/rpndata/deltat.data @@ -236,7 +235,6 @@ rpn/rpndata/deltat.old1.data rpn/rpndata/Leap_Second.old1.dat # Skyfield data files - rpn/rpndata/de421.bsp rpn/rpndata/finals2000A.all @@ -245,8 +243,10 @@ rpn/rpndata/finals2000A.all .vscode # RPN user data files - rpn/rpndata/rpnChilada_user_variables.cfg.backup rpn/rpndata/rpnChilada_user_config.cfg rpn/rpndata/rpnChilada_user_config.cfg.backup rpn/rpndata/rpnChilada_user_variables.cfg + +# RPN prime number data files +rpn/*.txt diff --git a/BackupRPN.bat b/BackupRPN.bat index 0675ff1d..296bd04c 100644 --- a/BackupRPN.bat +++ b/BackupRPN.bat @@ -14,7 +14,7 @@ iff "%1" == "" then endiff rem set VERSION=%@execstr[grep "PROGRAM_VERSION " rpn\rpnVersion.py | cut -d' ' -f3 | tr -d -c 01234567890.] -set RPN_FILES=__init__.py;rpn*.py;makeHelp.py;makeRPNPrimes.py;makeUnits.py;setup_rpn.py;test*.py;profile*.py;rpn.ico;rpn32.iss;rpn64.iss;BuildRPN.bat;BuildRPNInstaller.bat;requirements.txt;setup.cfg;MANIFEST.in;setup.py;unpickle.py;preparePrimeData.py;BackupRPN.bat;rpn.py;makeHelp.py;makeUnits.py;preparePrimes.py;testRPN.py;README.md;pylintrc +set RPN_FILES=__init__.py;rpn*.py;makeHelp.py;makeRPNPrimes.py;makeUnits.py;setup_rpn.py;test*.py;profile*.py;rpn.ico;rpn64.iss;BuildRPN.bat;BuildRPNInstaller.bat;BuildRPNExecutable.bat;requirements.txt;setup.cfg;MANIFEST.in;setup.py;unpickle.py;preparePrimeData.py;BackupRPN.bat;rpn.py;makeHelp.py;makeUnits.py;preparePrimes.py;testRPN.py;README.md;pylintrc;BuildRPNExecutable.bat;BuildRPNInstaller.bat;BackupRPN.bat;BuildRPNWheel.bat echo %VERSION @@ -48,7 +48,6 @@ cd units for /t; %TARGET_DIR in (%1) if exist %TARGET_DIR .and. isdir %TARGET_DIR copy rpn*.py %TARGET_DIR%\rpn\units cd .. - cd util for /t; %TARGET_DIR in (%1) if exist %TARGET_DIR .and. isdir %TARGET_DIR copy rpn*.py %TARGET_DIR%\rpn\util cd .. diff --git a/buildRPNExecutable.bat b/buildRPNExecutable.bat index 9c230020..805ab4b4 100644 --- a/buildRPNExecutable.bat +++ b/buildRPNExecutable.bat @@ -1,20 +1 @@ -rem TCC script for building the RPN installer - -setlocal - -echos VERSION= > version.txt -type rpn\rpnVersion.py | grep PROGRAM_VERSION | cut -d"'" -f2 >> version.txt - -set /r version.txt -set TCL_LIBRARY=C:\app\python38\tcl\tcl8.6 -set TK_LIBRARY=C:\app\python38\tcl\tk8.6 - -python setup_rpn.py build_exe - -copy rpn\rpndata\finals2000A.all build\exe.win-amd64-3.9\ -copy rpn\rpndata\de421.bsp build\exe.win-amd64-3.9\ - -del version.txt - -endlocal - +pyinstaller --onefile rpn.py diff --git a/buildRPNInstaller.bat b/buildRPNInstaller.bat index 32ba2d00..d6c6a8b2 100644 --- a/buildRPNInstaller.bat +++ b/buildRPNInstaller.bat @@ -2,26 +2,20 @@ rem TCC script for building the RPN installer setlocal -if not exist mkdir dist +if not exist installer_dist mkdir installer_dist if exist version.txt rm version.txt echos VERSION= > version.txt -type rpn\rpnVersion.py | grep PROGRAM_VERSION | cut -d"'" -f2 >> version.txt +type rpn\rpnVersion.py | grep "PROGRAM_VERSION =" | cut -d"'" -f2 >> version.txt set /r version.txt -iff %_X64 eq 1 then - "%PROG32_DIR%\Inno Setup 5\ISCC.exe" rpn64.iss - move Output\setup_rpnChilada.exe "dist\setup_rpnChilada-%VERSION%-win64.exe" -else - copy msvcp100-win32.dll build\exe.win32-3.6\msvcp100.dll - "%PROG32_DIR%\Inno Setup 5\ISCC.exe" rpn32.iss - move Output\setup_rpnChilada.exe "dist\setup_rpnChilada-%VERSION%-win32.exe" -endiff - -rem del /sxyz /nt build -rem del /sxyz /nt Output +"%PROG32_DIR%\Inno Setup 6\ISCC.exe" rpn64.iss +move Output\setup_rpnChilada.exe "dist\setup_rpnChilada-%VERSION%-win64.exe" + +del /sxyz /nt build +del /sxyz /nt Output del version.txt diff --git a/buildRPN.bat b/buildRPNWheel.bat similarity index 100% rename from buildRPN.bat rename to buildRPNWheel.bat diff --git a/rpn.spec b/rpn.spec new file mode 100644 index 00000000..63fd2aad --- /dev/null +++ b/rpn.spec @@ -0,0 +1,37 @@ +# -*- mode: python ; coding: utf-8 -*- + + +a = Analysis( + ['rpn.py'], + pathex=[], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, +) +pyz = PYZ(a.pure) + +exe = EXE( + pyz, + a.scripts, + a.binaries, + a.datas, + [], + name='rpn', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + upx_exclude=[], + runtime_tmpdir=None, + console=True, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, +) diff --git a/rpn/rpn.py b/rpn/rpn.py index bba4df49..5ef31b6c 100644 --- a/rpn/rpn.py +++ b/rpn/rpn.py @@ -41,6 +41,7 @@ from rpn.util.rpnAliases import OPERATOR_ALIASES from rpn.util.rpnDebug import debugPrint from rpn.util.rpnGenerator import RPNGenerator +from rpn.util.rpnUtils import getDataPath from rpn.time.rpnDateTime import formatDateTime @@ -682,14 +683,15 @@ def main( ): os.chdir( getUserDataPath( ) ) # SkyField doesn't like running in the root directory if not unitsFile.is_file( ): - print( 'Please run "rpnMakeUnits" (or makeUnits.py) to initialize the unit conversion data files.' ) + print( f'unit conversion data files not found in {getDataPath()}' ) + print( 'Please run makeUnits.py to initialize the unit conversion data files.' ) sys.exit( 0 ) helpFile = Path( getUserDataPath( ) + os.sep + 'help.pckl.bz2' ) if not helpFile.is_file( ): - debugPrint('Expected help file location: ', helpFile) - print( 'Please run "makeHelp" to initialize the help files.' ) + print( f'help files not found in {getDataPath()}' ) + print( 'Please run makeHelp.py to initialize the help files.' ) sys.exit( 0 ) try: diff --git a/rpn/util/rpnUtils.py b/rpn/util/rpnUtils.py index 5054c5b7..c7194e06 100644 --- a/rpn/util/rpnUtils.py +++ b/rpn/util/rpnUtils.py @@ -61,7 +61,7 @@ def getSourcePath( ): def getDataPath( ): '''Returns the path for the data files.''' if getattr( sys, 'frozen', False ): - dataPath = os.path.dirname( sys.executable ) + dataPath = os.path.dirname( sys.executable ) + os.sep + g.dataDir else: dataPath = os.path.dirname( os.path.realpath( __file__ ) ) + os.sep + '..' + os.sep + g.dataDir diff --git a/rpn32.iss b/rpn32.iss deleted file mode 100644 index e73d20ea..00000000 --- a/rpn32.iss +++ /dev/null @@ -1,83 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -#define MyAppName "rpnChilada" -#define MyAppVersion "7.2.beta3" -#define MyAppPublisher "Rick Gutleber" -#define MyAppURL "https://github.com/ConceptJunkie/rpn" -#define MyAppExeName "rpn.exe" -#define BuildDir="c:\sys\ut\rpn\rpn\build\exe.win32-3.6" - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{1599AA8E-2C12-4B55-8AA9-8F53E72C896C} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={pf}\{#MyAppName} -DefaultGroupName={#MyAppName} -AllowNoIcons=yes -LicenseFile=C:\sys\ut\rpn\gpl-3.0.txt -OutputBaseFilename=setup_rpn -Compression=lzma -SolidCompression=yes - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -Source: "{#BuildDir}\rpn.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\_bz2.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\_decimal.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\_lzma.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\_socket.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\gmpy2.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\help.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\library.zip"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\msvcp100.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\MSVCR100.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\pyexpat.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\python34.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\pywintypes34.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\select.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\unicodedata.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\unit_conversions.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\unit_help.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\units.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\win32api.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\win32evtlog.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\small_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\balanced_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\cousin_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\double_balanced_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\isolated_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\large_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\quad_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\quint_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sext_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sexy_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sexy_quadruplets.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sexy_triplets.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sophie_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\super_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\triplet_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\triple_balanced_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\twin_primes.cache"; DestDir: "{app}"; Flags: ignoreversion - -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\{#MyAppName} {#MyAppVersion}"; Filename: "{app}\{#MyAppExeName}" -Name: "{commondesktop}\{#MyAppName} {#MyAppVersion}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon diff --git a/rpn64.iss b/rpn64.iss index d5f16b4b..17276c47 100644 --- a/rpn64.iss +++ b/rpn64.iss @@ -2,11 +2,11 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "rpnChilada" -#define MyAppVersion "8.0.0" +#define MyAppVersion "9.0.beta1" #define MyAppPublisher "Rick Gutleber" #define MyAppURL "https://github.com/ConceptJunkie/rpn" #define MyAppExeName "rpn.exe" -#define BuildDir="c:\sys\ut\rpn\build\exe.win-amd64-3.7" +#define BuildDir="c:\sys\ut\rpn\" [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -35,54 +35,37 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "{#BuildDir}\rpn.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#BuildDir}\dist\rpn.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\gmpy2.cp37-win_amd64.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\library.zip"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\MSVCP140.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\VCRUNTIME140.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\pyexpat.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\python37.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\pywintypes37.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\select.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\unicodedata.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\win32api.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\win32evtlog.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\_bz2.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\_decimal.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\_lzma.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\_socket.pyd"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\lib\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\help.pckl.bz2"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\units.pckl.bz2"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\unit_conversions.pckl.bz2"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\unit_help.pckl.bz2"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\unit_names.pckl.bz2"; DestDir: "{app}\rpndata"; Flags: ignoreversion -Source: "{#BuildDir}\help.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\units.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\unit_conversions.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\unit_help.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\unit_names.pckl.bz2"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\balanced_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\cousin_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\double_balanced_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\huge_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\isolated_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\large_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\quad_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\quint_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\sext_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\sexy_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\sexy_quadruplets.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\sexy_triplets.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\small_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\sophie_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\super_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\triplet_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\triple_balanced_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\twin_primes.cache"; DestDir: "{app}\rpndata"; Flags: ignoreversion -Source: "{#BuildDir}\balanced_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\cousin_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\double_balanced_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\isolated_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\large_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\quad_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\quint_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sext_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sexy_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sexy_quadruplets.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sexy_triplets.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\small_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\sophie_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\super_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\triplet_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\triple_balanced_primes.cache"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\twin_primes.cache"; DestDir: "{app}"; Flags: ignoreversion - -Source: "{#BuildDir}\de421.bsp"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BuildDir}\finals2000A.all"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\de421.bsp"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\de405.bsp"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\deltat.data"; DestDir: "{app}\rpndata"; Flags: ignoreversion +Source: "{#BuildDir}\rpn\rpndata\deltat.preds"; DestDir: "{app}\rpndata"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/setup_rpn.py b/setup_rpn.py deleted file mode 100644 index 0bd0eb03..00000000 --- a/setup_rpn.py +++ /dev/null @@ -1,95 +0,0 @@ -import os - -from cx_Freeze import setup, Executable -from rpn.rpnVersion import PROGRAM_VERSION -import rpn.util.rpnGlobals as g - -# Dependencies are automatically detected, but it might need fine tuning. -buildOptions = \ - dict( - packages = [ - 'pkg_resources._vendor', - ], - - include_files = [ - 'rpn' + os.sep + g.dataDir + os.sep + 'units.pckl.bz2', - 'rpn' + os.sep + g.dataDir + os.sep + 'unit_conversions.pckl.bz2', - 'rpn' + os.sep + g.dataDir + os.sep + 'unit_help.pckl.bz2', - 'rpn' + os.sep + g.dataDir + os.sep + 'unit_names.pckl.bz2', - 'rpn' + os.sep + g.dataDir + os.sep + 'finals2000A.all', - 'rpn' + os.sep + g.dataDir + os.sep + 'balanced_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'cousin_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'double_balanced_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'huge_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'isolated_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'large_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'quadruple_balanced_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'quad_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'quint_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'sext_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'sexy_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'sexy_quadruplets.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'sexy_triplets.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'small_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'sophie_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'super_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'triplet_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'triple_balanced_primes.cache', - 'rpn' + os.sep + g.dataDir + os.sep + 'twin_primes.cache', - ], - - include_msvcr = 1, - optimize = 2, - ) - -executables = [ - Executable( script = 'rpn.py', - base = None, - icon = 'rpn.ico', - initScript = None, - shortcutName = 'rpnChilada ' + PROGRAM_VERSION, - targetName = 'rpn.exe' - ), - - Executable( script = 'preparePrimeData.py', - base = None, - icon = 'rpn.ico', - initScript = None, - shortcutName = 'rpnChilada Prepare Prime Data ' + PROGRAM_VERSION, - targetName = 'rpnPreparePrimeData.exe' - ), - - Executable( script = 'makeHelp.py', - base = None, - icon = 'rpn.ico', - initScript = None, - shortcutName = 'rpnChilada Make Help ' + PROGRAM_VERSION, - targetName = 'rpnMakeHelp.exe' - ), - - Executable( script = 'makeUnits.py', - base = None, - icon = 'rpn.ico', - initScript = None, - shortcutName = 'rpnChilada Make Units ' + PROGRAM_VERSION, - targetName = 'rpnMakeUnits.exe' - ), - - Executable( script = 'testRPN.py', - base = None, - icon = 'rpn.ico', - initScript = None, - shortcutName = 'rpnChilada Test ' + PROGRAM_VERSION, - targetName = 'testRPN.exe' - ) -] - -setup( name = 'rpn', - version = PROGRAM_VERSION, - author = 'Rick Gutleber', - author_email = 'rickg@his.com', - description = 'command-line RPN calculator', - options = dict( build_exe = buildOptions ), - executables = executables -) -