From 3dad21904d26f8f9e730e35302c4af1c7359b768 Mon Sep 17 00:00:00 2001 From: ivan386 Date: Tue, 3 Oct 2017 17:54:24 +0300 Subject: [PATCH] "i" prefix for builds and ignore torrent files in source archive --- setup/scripts/main.iss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/setup/scripts/main.iss b/setup/scripts/main.iss index e65c6b4e9e..10fd0462e9 100644 --- a/setup/scripts/main.iss +++ b/setup/scripts/main.iss @@ -226,18 +226,18 @@ ; Output files names #if Str(RELEASE_BUILD) == "1" && ConfigurationName == "Release" - #define output_name internal_name + "_" + version + "_" + PlatformName - #define symbols_name internal_name + "_" + version + "_" + PlatformName + "_Symbols.7z" - #define source_name internal_name + "_" + version + "_Source.7z" + #define output_name "i" + internal_name + "_" + version + "_" + PlatformName + #define symbols_name "i" + internal_name + "_" + version + "_" + PlatformName + "_Symbols.7z" + #define source_name "i" + internal_name + "_" + version + "_Source.7z" #else #ifdef REVISION - #define output_name internal_name + "_" + version + "_" + PlatformName + "_" + ConfigurationName + "_" + REVISION + "_" + date - #define symbols_name internal_name + "_" + PlatformName + "_" + ConfigurationName + "_" + REVISION + "_" + date + "_Symbols.7z" - #define source_name internal_name + "_" + REVISION + "_Source.7z" + #define output_name "i" + internal_name + "_" + version + "_" + PlatformName + "_" + ConfigurationName + "_" + REVISION + "_" + date + #define symbols_name "i" + internal_name + "_" + PlatformName + "_" + ConfigurationName + "_" + REVISION + "_" + date + "_Symbols.7z" + #define source_name "i" + internal_name + "_" + REVISION + "_Source.7z" #else - #define output_name internal_name + "_" + version + "_" + PlatformName + "_" + ConfigurationName + "_" + date - #define symbols_name internal_name + "_" + version + "_" + PlatformName + "_" + ConfigurationName + "_" + date + "_Symbols.7z" - #define source_name internal_name + "_" + version + "_Source.7z" + #define output_name "i" + internal_name + "_" + version + "_" + PlatformName + "_" + ConfigurationName + "_" + date + #define symbols_name "i" + internal_name + "_" + version + "_" + PlatformName + "_" + ConfigurationName + "_" + date + "_Symbols.7z" + #define source_name "i" + internal_name + "_" + version + "_Source.7z" #endif #endif @@ -1198,4 +1198,4 @@ end; #expr SaveToFile(SourcePath + "..\builds\Preprocessed.iss") #expr Exec( Zip, "a -y -mx=9 builds\" + symbols_name + " ""..\" + Compiler + "\" + PlatformName + "\" + ConfigurationName + "\*.pdb""", ".." ) -#expr Exec( Zip, "a -y -mx=9 -r -x!.vs -x!.svn -x!.git -x!setup\builds\*.exe -x!setup\builds\*.txt -x!setup\builds\*.iss -x!Win32 -x!x64 -x!.vs -x!ipch -x!*.7z -x!*.log -x!*.bak -x!*.VC.db -x!*.VC.opendb -x!*.tmp -x!*.sdf -x!*.suo -x!*.ncb -x!*.user -x!*.opensdf builds\" + source_name + " ..", ".." ) +#expr Exec( Zip, "a -y -mx=9 -r -x!.vs -x!.svn -x!.git -x!setup\builds\*.exe -x!setup\builds\*.txt -x!setup\builds\*.iss -x!Win32 -x!x64 -x!.vs -x!ipch -x!*.torrent -x!*.7z -x!*.log -x!*.bak -x!*.VC.db -x!*.VC.opendb -x!*.tmp -x!*.sdf -x!*.suo -x!*.ncb -x!*.user -x!*.opensdf builds\" + source_name + " ..", ".." )