inga-lovinde
/
FLocal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Release and Debug builds implemented in Builder

Browse Source
main
Inga 🏳‍🌈 15 years ago
parent 780fb01025
commit 4dcd1bc724
5 changed files with 65 additions and 44 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Builder/IISMainHandler/build.txt
  2. 70
      Builder/IISMainHandler/product.wxs
  3. 2
      Builder/IISUploadHandler/build.txt
  4. 25
      Builder/Program.cs
  5. 10
      build-all.bat

2
Builder/IISMainHandler/build.txt
Unescape View File

@ -1 +1 @@
670 685

70
Builder/IISMainHandler/product.wxs
Unescape View File

@ -1,12 +1,12 @@
<?xml version='1.0'?> <?xml version='1.0'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Id='*' Name='FLocal IISMainHandler' Language='1033' <Product Id='*' Name='FLocal IISMainHandler {target}' Language='1033'
Version='1.{rev}.{build}.0' Manufacturer='inga-lovinde' UpgradeCode='3981e346-b07f-45aa-bb8e-263a01dee3f1' > Version='1.{rev}.{build}.0' Manufacturer='inga-lovinde' UpgradeCode='3981e346-b07f-45aa-bb8e-263a01dee3f{targetId}' >
<Package Description='FLocal IISMainHandler' Comments='FLocal IISMainHandler' Manufacturer='inga-lovinde' InstallerVersion='300' Compressed='yes' Platform="x64" /> <Package Description='FLocal IISMainHandler {target}' Comments='FLocal IISMainHandler {target}' Manufacturer='inga-lovinde' InstallerVersion='300' Compressed='yes' Platform="x64" />
<Upgrade Id="3981e346-b07f-45aa-bb8e-263a01dee3f1"> <Upgrade Id="3981e346-b07f-45aa-bb8e-263a01dee3f{targetId}">
<UpgradeVersion Minimum="1.0.0" IncludeMinimum="yes" Maximum="1.{rev}.{build}" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED" /> <UpgradeVersion Minimum="1.0.0" IncludeMinimum="yes" Maximum="1.{rev}.{build}" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED" />
</Upgrade> </Upgrade>
<Upgrade Id="3981e346-b07f-45aa-bb8e-263a01dee3f1"> <Upgrade Id="3981e346-b07f-45aa-bb8e-263a01dee3f{targetId}">
<UpgradeVersion Minimum="1.{rev}.{build}" IncludeMinimum="no" Property="NEWERVERSIONDETECTED" /> <UpgradeVersion Minimum="1.{rev}.{build}" IncludeMinimum="no" Property="NEWERVERSIONDETECTED" />
</Upgrade> </Upgrade>
<InstallExecuteSequence> <InstallExecuteSequence>
@ -15,76 +15,78 @@
<Media Id='1' Cabinet='product.cab' EmbedCab='yes' /> <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder"> <Directory Id="ProgramFiles64Folder">
<Directory Id="APPLICATIONROOTDIRECTORY" Name="FLocal"/> <Directory Id="MANUFACTURERROOTDIRECTORY" Name="FLocal">
</Directory> <Directory Id="APPLICATIONROOTDIRECTORY" Name="main">
<Directory Id="INETPUBROOTDIRECTORY" Name="inetpub"> <Directory Id="APPLICATIONDIRECTORY" Name="{target}">
<Directory Id="INETPUBMAINDIRECTORY" Name="flocal-main"> <Directory Id="ARCHIVEDIRECTORY" Name="archive"/>
<Directory Id="BINARIESROOTDIRECTORY" Name="Bin"/> <Directory Id="BINARIESROOTDIRECTORY" Name="Bin"/>
<Directory Id="DATAROOTDIRECTORY" Name="data"/> <Directory Id="DATAROOTDIRECTORY" Name="data"/>
</Directory>
</Directory>
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
<DirectoryRef Id="BINARIESROOTDIRECTORY"> <DirectoryRef Id="BINARIESROOTDIRECTORY">
<Component Id="Core.dll" Guid="B8542489-E367-4AC6-9FCF-EA3454F0D642"> <Component Id="Core.dll" Guid="B8542489-E367-4AC6-9FCF-EA3454F0D64{targetId}">
<File Id="Core.dll" Source="..\..\Core\bin\Release\Core.dll" KeyPath="yes" Checksum="yes"/> <File Id="Core.dll" Source="..\..\Core\bin\Release\Core.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Core.pdb" Guid="3109981C-0182-48CA-B1CA-8F68F1C0F4B9"> <Component Id="Core.pdb" Guid="3109981C-0182-48CA-B1CA-8F68F1C0F4B{targetId}">
<File Id="Core.pdb" Source="..\..\Core\bin\Release\Core.pdb" KeyPath="yes" Checksum="yes"/> <File Id="Core.pdb" Source="..\..\Core\bin\Release\Core.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Common.dll" Guid="4CD35090-702C-479D-826B-2DE966FB0D45"> <Component Id="Common.dll" Guid="4CD35090-702C-479D-826B-2DE966FB0D4{targetId}">
<File Id="Common.dll" Source="..\..\Common\bin\Release\Common.dll" KeyPath="yes" Checksum="yes"/> <File Id="Common.dll" Source="..\..\Common\bin\Release\Common.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Common.pdb" Guid="78F773B8-0B28-4657-8E13-739FDB16F3C5"> <Component Id="Common.pdb" Guid="78F773B8-0B28-4657-8E13-739FDB16F3C{targetId}">
<File Id="Common.pdb" Source="..\..\Common\bin\Release\Common.pdb" KeyPath="yes" Checksum="yes"/> <File Id="Common.pdb" Source="..\..\Common\bin\Release\Common.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="MySQLConnector.dll" Guid="924EC439-F1F0-431F-A6EA-152C321F614C"> <Component Id="MySQLConnector.dll" Guid="924EC439-F1F0-431F-A6EA-152C321F614{targetId}">
<File Id="MySQLConnector.dll" Source="..\..\MySQLConnector\bin\Release\MySQLConnector.dll" KeyPath="yes" Checksum="yes"/> <File Id="MySQLConnector.dll" Source="..\..\MySQLConnector\bin\Release\MySQLConnector.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="MySQLConnector.pdb" Guid="32AA82C5-1561-4612-A113-C7A099C3ECEF"> <Component Id="MySQLConnector.pdb" Guid="32AA82C5-1561-4612-A113-C7A099C3ECE{targetId}">
<File Id="MySQLConnector.pdb" Source="..\..\IISMainHandler\bin\Release\MySQLConnector.pdb" KeyPath="yes" Checksum="yes"/> <File Id="MySQLConnector.pdb" Source="..\..\IISMainHandler\bin\Release\MySQLConnector.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="IISMainHandler.dll" Guid="E3BCF3A1-75C0-4CD7-95D4-4A0245B1CA18"> <Component Id="IISMainHandler.dll" Guid="E3BCF3A1-75C0-4CD7-95D4-4A0245B1CA1{targetId}">
<File Id="IISMainHandler.dll" Source="..\..\IISMainHandler\bin\Release\IISMainHandler.dll" KeyPath="yes" Checksum="yes"/> <File Id="IISMainHandler.dll" Source="..\..\IISMainHandler\bin\Release\IISMainHandler.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="IISMainHandler.pdb" Guid="4F5F1280-8EC8-4C56-80F4-8C810F0C839F"> <Component Id="IISMainHandler.pdb" Guid="4F5F1280-8EC8-4C56-80F4-8C810F0C839{targetId}">
<File Id="IISMainHandler.pdb" Source="..\..\IISMainHandler\bin\Release\IISMainHandler.pdb" KeyPath="yes" Checksum="yes"/> <File Id="IISMainHandler.pdb" Source="..\..\IISMainHandler\bin\Release\IISMainHandler.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Importer.dll" Guid="F25304A3-2705-4E97-B0E9-1DF04C277AD8"> <Component Id="Importer.dll" Guid="F25304A3-2705-4E97-B0E9-1DF04C277AD{targetId}">
<File Id="Importer.dll" Source="..\..\Importer\bin\Release\Importer.dll" KeyPath="yes" Checksum="yes"/> <File Id="Importer.dll" Source="..\..\Importer\bin\Release\Importer.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Importer.pdb" Guid="6AE31E67-EFC6-471B-BB55-0DF628399D35"> <Component Id="Importer.pdb" Guid="6AE31E67-EFC6-471B-BB55-0DF628399D3{targetId}">
<File Id="Importer.pdb" Source="..\..\Importer\bin\Release\Importer.pdb" KeyPath="yes" Checksum="yes"/> <File Id="Importer.pdb" Source="..\..\Importer\bin\Release\Importer.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="ImportConsole.exe" Guid="45962809-9BE4-4792-9759-21C49FCA57F7"> <Component Id="ImportConsole.exe" Guid="45962809-9BE4-4792-9759-21C49FCA57F{targetId}">
<File Id="ImportConsole.exe" Source="..\..\ImportConsole\bin\Release\ImportConsole.exe" KeyPath="yes" Checksum="yes"/> <File Id="ImportConsole.exe" Source="..\..\ImportConsole\bin\Release\ImportConsole.exe" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="ImportConsole.pdb" Guid="6E5DCF23-7247-4DE0-BB6D-1A8463723437"> <Component Id="ImportConsole.pdb" Guid="6E5DCF23-7247-4DE0-BB6D-1A846372343{targetId}">
<File Id="ImportConsole.pdb" Source="..\..\ImportConsole\bin\Release\ImportConsole.pdb" KeyPath="yes" Checksum="yes"/> <File Id="ImportConsole.pdb" Source="..\..\ImportConsole\bin\Release\ImportConsole.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="NConsoler.dll" Guid="F39FD087-8961-4871-9D59-FDB83002BC91"> <Component Id="NConsoler.dll" Guid="F39FD087-8961-4871-9D59-FDB83002BC9{targetId}">
<File Id="NConsoler.dll" Source="..\..\ThirdParty\NConsoler\NConsoler.dll" KeyPath="yes" Checksum="yes"/> <File Id="NConsoler.dll" Source="..\..\ThirdParty\NConsoler\NConsoler.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="PJonDevelopment.BBCode.dll" Guid="5271E184-FCCB-433C-B789-959B410D6DDA"> <Component Id="PJonDevelopment.BBCode.dll" Guid="5271E184-FCCB-433C-B789-959B410D6DD{targetId}">
<File Id="PJonDevelopment.BBCode.dll" Source="..\..\ThirdParty\BBCode\bin\Release\PJonDevelopment.BBCode.dll" KeyPath="yes" Checksum="yes"/> <File Id="PJonDevelopment.BBCode.dll" Source="..\..\ThirdParty\BBCode\bin\Release\PJonDevelopment.BBCode.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="PJonDevelopment.BBCode.pdb" Guid="EFFBA1FA-A3A8-4D20-8894-AFD255B9F005"> <Component Id="PJonDevelopment.BBCode.pdb" Guid="EFFBA1FA-A3A8-4D20-8894-AFD255B9F00{targetId}">
<File Id="PJonDevelopment.BBCode.pdb" Source="..\..\ThirdParty\BBCode\bin\Release\PJonDevelopment.BBCode.pdb" KeyPath="yes" Checksum="yes"/> <File Id="PJonDevelopment.BBCode.pdb" Source="..\..\ThirdParty\BBCode\bin\Release\PJonDevelopment.BBCode.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<!--Component Id="MySql.Data.dll" Guid="90646729-6B21-4BEE-94C3-F39F5288EFB3"> <!--Component Id="MySql.Data.dll" Guid="90646729-6B21-4BEE-94C3-F39F5288EFB{targetId}">
<File Id="MySql.Data.dll" Source="..\..\ThirdParty\mysql-connector-net-6.2.3\MySql.Data\Provider\bin\Release\MySql.Data.dll" KeyPath="yes" Checksum="yes"/> <File Id="MySql.Data.dll" Source="..\..\ThirdParty\mysql-connector-net-6.2.3\MySql.Data\Provider\bin\Release\MySql.Data.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="MySql.Data.pdb" Guid="7105BA2A-A10A-4E41-AA4F-30FA66499BE6"> <Component Id="MySql.Data.pdb" Guid="7105BA2A-A10A-4E41-AA4F-30FA66499BE{targetId}">
<File Id="MySql.Data.pdb" Source="..\..\ThirdParty\mysql-connector-net-6.2.3\MySql.Data\Provider\bin\Release\MySql.Data.pdb" KeyPath="yes" Checksum="yes"/> <File Id="MySql.Data.pdb" Source="..\..\ThirdParty\mysql-connector-net-6.2.3\MySql.Data\Provider\bin\Release\MySql.Data.pdb" KeyPath="yes" Checksum="yes"/>
</Component--> </Component-->
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="APPLICATIONROOTDIRECTORY"> <DirectoryRef Id="ARCHIVEDIRECTORY">
<Component Id="Templates.7z" Guid="B41F4142-A39C-43BE-8D20-F31BFFA9B483"> <Component Id="Templates.7z" Guid="B41F4142-A39C-43BE-8D20-F31BFFA9B48{targetId}">
<File Id="Templates.7z" Source="Templates.7z" KeyPath="yes" Checksum="yes"/> <File Id="Templates.7z" Source="Templates.7z" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Static.7z" Guid="C5D6456D-39B0-40E1-8DB1-0950199B15D2"> <Component Id="Static.7z" Guid="C5D6456D-39B0-40E1-8DB1-0950199B15D{targetId}">
<File Id="Static.7z" Source="Static.7z" KeyPath="yes" Checksum="yes"/> <File Id="Static.7z" Source="Static.7z" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="_7z.exe" Guid="57AD7901-2C9B-4349-ABD8-C8FBA82F2724"> <Component Id="_7z.exe" Guid="57AD7901-2C9B-4349-ABD8-C8FBA82F272{targetId}">
<File Id="_7z.exe" Name="7z.exe" Source="7z.exe" KeyPath="yes" Checksum="yes"/> <File Id="_7z.exe" Name="7z.exe" Source="7z.exe" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
@ -137,8 +139,8 @@
</Feature> </Feature>
</Feature> </Feature>
<CustomAction Id="InstallTemplates" FileKey="_7z.exe" ExeCommand="x &quot;C:\Program Files\FLocal\Templates.7z&quot; -oC:\inetpub\flocal-main\data\templates\ -aoa -y" Execute="deferred" Impersonate="no" Return="check"/> <CustomAction Id="InstallTemplates" FileKey="_7z.exe" ExeCommand="x &quot;C:\Program Files\FLocal\main\{target}\archive\Templates.7z&quot; -o&quot;C:\Program Files\FLocal\main\{target}\data\templates\&quot; -aoa -y" Execute="deferred" Impersonate="no" Return="check"/>
<CustomAction Id="InstallStatic" FileKey="_7z.exe" ExeCommand="x &quot;C:\Program Files\FLocal\Static.7z&quot; -oC:\inetpub\flocal-main\data\Static\ -aoa -y" Execute="deferred" Impersonate="no" Return="check"/> <CustomAction Id="InstallStatic" FileKey="_7z.exe" ExeCommand="x &quot;C:\Program Files\FLocal\main\{target}\archive\Static.7z&quot; -o&quot;C:\Program Files\FLocal\main\{target}\data\Static\&quot; -aoa -y" Execute="deferred" Impersonate="no" Return="check"/>
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action="InstallTemplates" Before="InstallFinalize"> <Custom Action="InstallTemplates" Before="InstallFinalize">
<![CDATA[NOT REMOVE]]> <![CDATA[NOT REMOVE]]>

2
Builder/IISUploadHandler/build.txt
Unescape View File

@ -1 +1 @@
403 406

25
Builder/Program.cs
Unescape View File

@ -32,18 +32,35 @@ namespace Builder {
string WIXPATH = ConfigurationManager.AppSettings["WiXPath"]; string WIXPATH = ConfigurationManager.AppSettings["WiXPath"];
string SVNPATH = ConfigurationManager.AppSettings["SVNPath"]; string SVNPATH = ConfigurationManager.AppSettings["SVNPath"];
if(args.Length != 1) throw new ApplicationException("You should specify project name first"); if(args.Length < 1) throw new ApplicationException("You should specify project name first");
string path = args[0]; string path = args[0];
if(!Directory.Exists(path)) throw new ApplicationException("Directory doesn't exists"); if(!Directory.Exists(path)) throw new ApplicationException("Directory doesn't exists");
string fullPath = new DirectoryInfo(path).FullName; string fullPath = new DirectoryInfo(path).FullName;
fullPath += Path.DirectorySeparatorChar; fullPath += Path.DirectorySeparatorChar;
string target = "release";
string targetId = "1";
if(args.Length > 1) {
switch(args[1].ToLower()) {
case "release":
target = "release";
targetId = "1";
break;
case "debug":
target = "debug";
targetId = "2";
break;
default:
throw new ApplicationException("Wrong target");
}
}
string sourceFile = fullPath + "product.wxs"; string sourceFile = fullPath + "product.wxs";
if(!File.Exists(sourceFile)) throw new ApplicationException("No wxs file could be found"); if(!File.Exists(sourceFile)) throw new ApplicationException("No wxs file could be found");
string targetFile = fullPath + "product.wixobj"; string targetFile = fullPath + "product.wixobj";
string wixPdbFile = fullPath + "product.wixpdb"; string wixPdbFile = fullPath + "product-" + target + ".wixpdb";
string outputFile = fullPath + "product.msi"; string outputFile = fullPath + "product-" + target + ".msi";
string prebuildCommands = fullPath + "prebuild.bat"; string prebuildCommands = fullPath + "prebuild.bat";
string postbuildCommands = fullPath + "postbuild.bat"; string postbuildCommands = fullPath + "postbuild.bat";
string buildNumberFile = fullPath + "build.txt"; string buildNumberFile = fullPath + "build.txt";
@ -95,7 +112,7 @@ namespace Builder {
using(StreamReader sourceReader = new StreamReader(sourceFile)) { using(StreamReader sourceReader = new StreamReader(sourceFile)) {
wxsData = sourceReader.ReadToEnd(); wxsData = sourceReader.ReadToEnd();
} }
wxsData = wxsData.Replace("{rev}", revNumber.ToString()).Replace("{build}", buildNumber.ToString()); wxsData = wxsData.Replace("{rev}", revNumber.ToString()).Replace("{build}", buildNumber.ToString()).Replace("{target}", target).Replace("{targetId}", targetId);
using(StreamWriter tempWriter = tempFile.getWriter()) { using(StreamWriter tempWriter = tempFile.getWriter()) {
tempWriter.Write(wxsData); tempWriter.Write(wxsData);

10
build-all.bat
Unescape View File

@ -1,7 +1,9 @@
@echo off @echo off
@rem Note that this script will only produce a .msi packet of your binaries and data. It will not compile your sources. @rem Note that this script will only produce a .msi packet of your binaries and data. It will not compile your sources.
cd Builder cd Builder
Builder IISMainHandler Builder IISMainHandler debug
move /Y IISMainHandler\product.msi ..\IISMainHandler.msi move /Y IISMainHandler\product-debug.msi ..\IISMainHandler-debug.msi
Builder IISUploadHandler Builder IISMainHandler release
move /Y IISUploadHandler\product.msi ..\IISUploadHandler.msi move /Y IISMainHandler\product-release.msi ..\IISMainHandler-release.msi
rem Builder IISUploadHandler release
rem move /Y IISUploadHandler\product-release.msi ..\IISUploadHandler-release.msi
Write Preview
Loading…
Cancel
Save