Separate debug/release output in different directories.

Author: asfernandes

.gitignore

@@ -1,7 +1,7 @@
 temp/
 /gen/
-output_Win32/
-output_x64/
+output_Win32_*/
+output_x64_*/
 examples/prebuilt/
 .vs/
 m4/

builds/install/arch-specific/win32/BuildExecutableInstall.bat

@@ -652,7 +652,7 @@ for %%v in ( %1 %2 %3 %4 %5 %6 %7 %8 %9 )  do (
 
 pushd ..\..\..\win32
 ::This must be called from the directory it resides in.
-@call setenvvar.bat
+@call setenvvar.bat %*
 popd
 @if errorlevel 1 (goto :END)
 

builds/install/arch-specific/win32/FirebirdInstall.iss

@@ -117,8 +117,9 @@
 ;We speed up compilation (and hence testing) by not compressing contents.
 #undef compression
 
-;Default to x64 for testing
+;Default to x64_release for testing
 #define PlatformTarget "x64"
+#define ConfigurationTarget "release"
 #endif
 ;-------#ifdef iss_debug
 
@@ -216,6 +217,15 @@
 #endif
 #endif
 
+;---- If we haven't already set ConfigurationTarget then pick it up from the environment.
+#ifndef ConfigurationTarget
+#define ConfigurationTarget GetEnv("FBBUILD_BUILDTYPE")
+#endif
+#if ConfigurationTarget == ""
+;Assume release
+#define ConfigurationTarget "release"
+#endif
+
 #if FB_BUILD_TYPE == "T"
 ;If we are still under development we can ignore some missing files.
 #define SkipFileIfDevStatus " skipifsourcedoesntexist "
@@ -224,7 +234,7 @@
 #endif
 
 ;This location is relative to SourceDir (declared below)
-#define FilesDir="output_" + PlatformTarget
+#define FilesDir="output_" + PlatformTarget + "_" + ConfigurationTarget
 #if PlatformTarget == "x64"
 #define WOW64Dir="output_win32"
 #endif

builds/win32/clean_all.bat

@@ -1,6 +1,6 @@
 @echo off
 
-@call setenvvar.bat
+@call setenvvar.bat %*
 @if errorlevel 1 (goto :END)
 
 set FB_CLEAN_SHARED=

builds/win32/create_msgs.bat

@@ -1,8 +1,7 @@
 @echo off
 
-@call setenvvar.bat
+@call setenvvar.bat %*
 @if errorlevel 1 (goto :END)
-@if not defined FB_BOOT_BIN_DIR (@call set_build_target.bat %*)
 
 @echo Building build_msg (%FB_OBJ_DIR%)...
 @call compile.bat builds\win32\%VS_VER%\FirebirdBoot build_msg_%FB_TARGET_PLATFORM%.log build_msg

builds/win32/make_all.bat

@@ -2,7 +2,7 @@
 set ERRLEV=0
 
 :: Set env vars
-@call setenvvar.bat
+@call setenvvar.bat %*
 
 @if errorlevel 1 (call :ERROR Executing setenvvar.bat failed & goto :EOF)
 
@@ -11,8 +11,6 @@ set ERRLEV=0
 @if not exist %FB_BIN_DIR%\firebird.msg (goto :HELP_BOOT & goto :EOF)
 
 
-@call set_build_target.bat %*
-
 ::==========
 :: MAIN
 

builds/win32/make_boot.bat

@@ -8,11 +8,9 @@
 set ERRLEV=0
 
 :CHECK_ENV
-@call setenvvar.bat
+@call setenvvar.bat %*
 @if errorlevel 1 (goto :END)
 
-@call set_build_target.bat %*
-
 
 ::===========
 :MAIN
@@ -67,7 +65,7 @@ if "%ERRLEV%"=="1" goto :END
 
 ::=======
 @echo Preprocessing the source files needed to build gpre and isql...
-@call preprocess.bat BOOT
+@call preprocess.bat %FBBUILD_BUILDTYPE% BOOT
 
 ::=======
 call :engine
@@ -93,14 +91,14 @@ if "%ERRLEV%"=="1" goto :END
 
 ::=======
 @echo Preprocessing the entire source tree...
-@call preprocess.bat
+@call preprocess.bat %FBBUILD_BUILDTYPE%
 
 ::=======
 @call :msgs
 if "%ERRLEV%"=="1" goto :END
 
 ::=======
-@call create_msgs.bat msg
+@call create_msgs.bat %FBBUILD_BUILDTYPE%
 ::=======
 
 @call :NEXT_STEP
@@ -262,8 +260,6 @@ goto :EOF
 @echo create database '%FB_GEN_DB_DIR%/dbs/metadata.fdb'; | "%FB_BIN_DIR%\isql" -q -sqldialect 1
 @copy %FB_GEN_DIR%\dbs\metadata.fdb %FB_GEN_DIR%\dbs\yachts.lnk > nul
 
-@call create_msgs.bat db
-
 @goto :EOF
 
 

builds/win32/make_examples.bat

@@ -1,11 +1,9 @@
 @echo off
 
 :: Set env vars
-@call setenvvar.bat
+@call setenvvar.bat %*
 @if errorlevel 1 (goto :EOF)
 
-@call set_build_target.bat %*
-
 :: verify that boot was run before
 @if not exist %FB_BIN_DIR%\isql.exe (goto :HELP_BOOT & goto :EOF)
 @if not exist %FB_BIN_DIR%\gpre.exe (goto :HELP_BOOT & goto :EOF)

builds/win32/make_icu.bat

@@ -2,9 +2,7 @@
 
 
 :: Set env vars
-@call setenvvar.bat
-
-@call set_build_target.bat %* icu
+@call setenvvar.bat %*
 
 ::==========
 :: MAIN

builds/win32/msvc15/chacha.vcxproj

@@ -104,10 +104,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\output_$(PlatformName)\plugins\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\output_$(PlatformName)\plugins\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\output_$(PlatformName)\plugins\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\output_$(PlatformName)\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\output_$(PlatformName)_$(Configuration)\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\output_$(PlatformName)_$(Configuration)\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\output_$(PlatformName)_$(Configuration)\plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\output_$(PlatformName)_$(Configuration)\plugins\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>