Merge pull request #393 from efiop/master

build dirs cleanup

scripts/build_linux.sh

@@ -67,7 +67,7 @@ install_dependencies()
 build_dvc()
 {
 	print_info "Building dvc binary..."
-	pyinstaller --onefile --additional-hooks-dir $(pwd)/hooks dvc/__main__.py --name dvc --distpath $BIN_DIR --specpath $BUILD_DIR
+	pyinstaller --onefile --additional-hooks-dir $(pwd)/scripts/hooks dvc/__main__.py --name dvc --distpath $BIN_DIR --specpath $BUILD_DIR
 }
 
 cleanup

scripts/build_macos.sh

@@ -56,7 +56,7 @@ install_dependencies()
 build_dvc()
 {
 	print_info "Building dvc binary..."
-	pyinstaller --onefile --additional-hooks-dir $(pwd)/hooks dvc/__main__.py --name dvc --distpath $BIN_DIR --specpath $BUILD_DIR
+	pyinstaller --onefile --additional-hooks-dir $(pwd)/scripts/hooks dvc/__main__.py --name dvc --distpath $BIN_DIR --specpath $BUILD_DIR
 }
 
 cleanup

scripts/build_windows.cmd

@@ -19,15 +19,15 @@ call pip install -r requirements.txt || goto :error
 call pip install pyinstaller || goto :error
 
 echo ====== Building dvc binary... ======
-call pyinstaller --onefile --additional-hooks-dir hooks dvc/__main__.py --name dvc --specpath build
+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

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)

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