diff --git a/scripts/build_windows.cmd b/scripts/build_windows.cmd index 9678c2fbd..8b1502850 100644 --- a/scripts/build_windows.cmd +++ b/scripts/build_windows.cmd @@ -22,12 +22,12 @@ echo ====== Building dvc binary... ====== call pyinstaller --onefile --additional-hooks-dir scripts\hooks dvc/__main__.py --name dvc --specpath build echo ====== Copying additional files... ====== -copy innosetup\addSymLinkPermissions.ps1 dist\ || goto :error +copy scripts\innosetup\addSymLinkPermissions.ps1 dist\ || goto :error echo ====== Building dvc installer... ====== set PYTHONPATH=%cd% -call python innosetup\config_gen.py || goto :error -call "C:\Program Files (x86)\Inno Setup 5\iscc" innosetup\setup.iss || goto :error +call python scripts\innosetup\config_gen.py || goto :error +call "C:\Program Files (x86)\Inno Setup 5\iscc" scripts\innosetup\setup.iss || goto :error echo ====== DONE ====== goto :EOF diff --git a/innosetup/addSymLinkPermissions.ps1 b/scripts/innosetup/addSymLinkPermissions.ps1 similarity index 100% rename from innosetup/addSymLinkPermissions.ps1 rename to scripts/innosetup/addSymLinkPermissions.ps1 diff --git a/innosetup/addsymlink.iss b/scripts/innosetup/addsymlink.iss similarity index 100% rename from innosetup/addsymlink.iss rename to scripts/innosetup/addsymlink.iss diff --git a/innosetup/config_gen.py b/scripts/innosetup/config_gen.py similarity index 85% rename from innosetup/config_gen.py rename to scripts/innosetup/config_gen.py index 18a02a96c..ab7601ba9 100644 --- a/innosetup/config_gen.py +++ b/scripts/innosetup/config_gen.py @@ -10,5 +10,5 @@ config = ConfigParser.ConfigParser() config.add_section('Version') config.set('Version', 'Version', VERSION) -with open('innosetup/config.ini', 'w') as f: +with open('scripts/innosetup/config.ini', 'w') as f: config.write(f) diff --git a/innosetup/dvc.ico b/scripts/innosetup/dvc.ico similarity index 100% rename from innosetup/dvc.ico rename to scripts/innosetup/dvc.ico diff --git a/innosetup/dvc_left.bmp b/scripts/innosetup/dvc_left.bmp similarity index 100% rename from innosetup/dvc_left.bmp rename to scripts/innosetup/dvc_left.bmp diff --git a/innosetup/dvc_up.bmp b/scripts/innosetup/dvc_up.bmp similarity index 100% rename from innosetup/dvc_up.bmp rename to scripts/innosetup/dvc_up.bmp diff --git a/innosetup/modpath.iss b/scripts/innosetup/modpath.iss similarity index 100% rename from innosetup/modpath.iss rename to scripts/innosetup/modpath.iss diff --git a/innosetup/setup.iss b/scripts/innosetup/setup.iss similarity index 92% rename from innosetup/setup.iss rename to scripts/innosetup/setup.iss index 0b4638670..6b235fd02 100644 --- a/innosetup/setup.iss +++ b/scripts/innosetup/setup.iss @@ -1,8 +1,8 @@ #define MyAppName "Data Version Control" -#define MyAppVersion ReadIni(".\innosetup\config.ini", "Version", "version", "unknown") +#define MyAppVersion ReadIni(".\scripts\innosetup\config.ini", "Version", "version", "unknown") #define MyAppPublisher "Dmitry Petrov" #define MyAppURL "https://dataversioncontrol.com/" -#define MyAppDir "..\dist" +#define MyAppDir "..\..\dist" [Setup] AppId={{8258CE8A-110E-4E0D-AE60-FEE00B15F041} @@ -15,11 +15,11 @@ AppUpdatesURL={#MyAppURL} DefaultDirName={code:GetDefaultDirName} DefaultGroupName={#MyAppName} AllowNoIcons=yes -LicenseFile=..\LICENSE +LicenseFile=..\..\LICENSE OutputBaseFilename=dvc-{#MyAppVersion} Compression=lzma2/max SolidCompression=yes -OutputDir=..\ +OutputDir=..\..\ ChangesEnvironment=yes SetupIconFile=dvc.ico WizardSmallImageFile=dvc_up.bmp