--- dao/DelphiScanner/BuildVariants.cmd	2016/06/14 11:47:59	3050
+++ dao/DelphiScanner/BuildVariants.cmd	2016/06/14 12:06:29	3051
@@ -6,6 +6,9 @@
 REM Versionsnr skal sættes både som variabel her men også i projekt filen
 SET VER=6_2_4
 
+REM ryd eksisterende indhold af %STED%
+SET STED=
+
 REM cleaning files
 DEL *.dcu /S
 DEL *.exe /S
@@ -17,111 +20,57 @@
 MKDIR %BUILDDIR%
 
 
-
+REM START BUILD AF VARIANTERNE
+REM 
 
 SET DIST=BK
-DEL *.dcu /S
-SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_%DIST%_omdelinginfo
-msbuild.exe RuteLabels.dproj /p:Config=Release;DCC_Define=STED_%DIST%
-MKDIR %DIR%
-MKDIR %DIR%\Docs
-MKDIR %DIR%\Logs
-MKDIR %DIR%\Sounds
-COPY Help\Manual*.pdf %DIR%\Docs
-COPY Sounds\* %DIR%\Sounds
-COPY IniTemplates\%DIST%.ini %DIR%\RuteLabels.ini
-MOVE RuteLabels.exe %DIR%
+CALL :SUB_BUILD
 
 
 REM TK er BK's lokation hos TrykKompagniet i Hvidovre
 SET DIST=TK
-DEL *.dcu /S
-SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_%DIST%_omdelinginfo
-msbuild.exe RuteLabels.dproj /p:Config=Release;DCC_Define=STED_%DIST%
-MKDIR %DIR%
-MKDIR %DIR%\Docs
-MKDIR %DIR%\Logs
-MKDIR %DIR%\Sounds
-COPY Help\Manual*.pdf %DIR%\Docs
-COPY Sounds\* %DIR%\Sounds
-COPY IniTemplates\%DIST%.ini %DIR%\RuteLabels.ini
-MOVE RuteLabels.exe %DIR%
+CALL :SUB_BUILD
 
 
 SET DIST=DBK
-DEL *.dcu /S
-SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_%DIST%_omdelinginfo
-msbuild.exe RuteLabels.dproj /p:Config=Release;DCC_Define=STED_%DIST%
-MKDIR %DIR%
-MKDIR %DIR%\Docs
-MKDIR %DIR%\Logs
-MKDIR %DIR%\Sounds
-COPY Help\Manual*.pdf %DIR%\Docs
-COPY Sounds\* %DIR%\Sounds
-COPY IniTemplates\%DIST%.ini %DIR%\RuteLabels.ini
-MOVE RuteLabels.exe %DIR%
+CALL :SUB_BUILD
 
 
 SET DIST=FD
-DEL *.dcu /S
-SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_%DIST%_omdelinginfo
-msbuild.exe RuteLabels.dproj /p:Config=Release;DCC_Define=STED_%DIST%
-MKDIR %DIR%
-MKDIR %DIR%\Docs
-MKDIR %DIR%\Logs
-MKDIR %DIR%\Sounds
-COPY Help\Manual*.pdf %DIR%\Docs
-COPY Sounds\* %DIR%\Sounds
-COPY IniTemplates\%DIST%.ini %DIR%\RuteLabels.ini
-MOVE RuteLabels.exe %DIR%
+CALL :SUB_BUILD
 
 SET DIST=NS
-DEL *.dcu /S
-SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_%DIST%_omdelinginfo
-msbuild.exe RuteLabels.dproj /p:Config=Release;DCC_Define=STED_%DIST%
-MKDIR %DIR%
-MKDIR %DIR%\Docs
-MKDIR %DIR%\Logs
-MKDIR %DIR%\Sounds
-COPY Help\Manual*.pdf %DIR%\Docs
-COPY Sounds\* %DIR%\Sounds
-COPY IniTemplates\%DIST%.ini %DIR%\RuteLabels.ini
-MOVE RuteLabels.exe %DIR%
+CALL :SUB_BUILD
 
 
 REM ---------------------------------------------------------------------------
 REM BYG DAO varianter
 
 SET DIST=DAO
-DEL *.dcu /S
 
-msbuild.exe RuteLabels.dproj /p:Config=Release;DCC_Define=STED_%DIST%
+SET STED=_BRA
+CALL :SUB_BUILD
 
+SET STED=_GLL
+CALL :SUB_BUILD
 
-SET STED=BRA
-SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_DAO_%STED%_omdelinginfo
-MKDIR %DIR%
-MKDIR %DIR%\Docs
-MKDIR %DIR%\Logs
-MKDIR %DIR%\Sounds
-COPY Help\Manual*.pdf %DIR%\Docs
-COPY Sounds\* %DIR%\Sounds
-COPY IniTemplates\%STED%.ini %DIR%\RuteLabels.ini
-COPY RuteLabels.exe %DIR%
+SET STED=_ALB
+CALL :SUB_BUILD
 
-SET STED=GLL
-SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_DAO_%STED%_omdelinginfo
-MKDIR %DIR%
-MKDIR %DIR%\Docs
-MKDIR %DIR%\Logs
-MKDIR %DIR%\Sounds
-COPY Help\Manual*.pdf %DIR%\Docs
-COPY Sounds\* %DIR%\Sounds
-COPY IniTemplates\%STED%.ini %DIR%\RuteLabels.ini
-COPY RuteLabels.exe %DIR%
 
-SET STED=ALB
-SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_DAO_%STED%_omdelinginfo
+GOTO EOF
+
+
+:SUB_BUILD
+REM Denne subroutine sørger for at builde varianten der passer på %DIST% og opretter installationsmapper med alt
+REM tilhørende indhold
+ECHO ---------------------------------------------------------------------------
+ECHO Builder %DIST% %STED%
+DEL *.dcu /S
+
+SET DIR=%BUILDDIR%\RuteLabels_ver%VER%_%DIST%%STED%_omdelinginfo
+
+msbuild.exe RuteLabels.dproj /p:Config=Release;DCC_Define=STED_%DIST%
 MKDIR %DIR%
 MKDIR %DIR%\Docs
 MKDIR %DIR%\Logs
@@ -130,5 +79,13 @@
 COPY Sounds\* %DIR%\Sounds
 COPY IniTemplates\%STED%.ini %DIR%\RuteLabels.ini
 COPY RuteLabels.exe %DIR%
+EXIT /B
+REM End of Build sub routine
+
+
+:EOF
 
-DEL RuteLabels.exe
\ No newline at end of file
+ECHO ----------------------------------------------------------------------
+ECHO Rydder op
+DEL RuteLabels.exe
+DEL *.dcu /S
\ No newline at end of file