[bistro-framework] r444 committed - [No log message]

[codesite...@google.com]

Revision: 444
Author: sasha_...@mail.ru
Date: Sat May 15 01:13:14 2010
Log: [No log message]
http://code.google.com/p/bistro-framework/source/detail?r=444

Modified:
/Bistro/trunk/Bistro.SetupWiX/EditTemplates/Program.cs
/Bistro/trunk/Bistro.SetupWiX/EditTemplates/versionWriter.exe
/Bistro/trunk/Bistro.SetupWiX/Setup.wxs
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/CSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
/Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Core.dll
/Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll
/Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
/Bistro/trunk/Bistro.SetupWiX/versionWriterFull.exe

=======================================
--- /Bistro/trunk/Bistro.SetupWiX/EditTemplates/Program.cs Thu Apr 22
05:27:51 2010
+++ /Bistro/trunk/Bistro.SetupWiX/EditTemplates/Program.cs Sat May 15
01:13:14 2010
@@ -11,7 +11,8 @@
{
class Program
{
- private const string NDJANGODIR = "[NDJANGODIR]";
+ private const string NDJANGODIR35 = "[NDJANGODIR35]";
+ private const string NDJANGODIR40 = "[NDJANGODIR40]";
private const string BISTRODIR = "[BISTRODIR]";
private const string EXTENDERDIR = "[EXTENDERDIR]";
private const string NDJANGOVER = "0.9.7";
@@ -30,7 +31,8 @@
String FILE_PATH = args[0];

String bistroPath =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\Bistro").GetValue("InstallDir");
- String ndjangoPath =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\NDjango").GetValue("InstallDir");
+ String ndjangoPath35 =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\NDjango\Net35").GetValue("InstallDir");
+ String ndjangoPath40 =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\NDjango\Net40").GetValue("InstallDir");
String extenderPath =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\ProjectExtender").GetValue("InstallDir");

FILE_PATH = FILE_PATH.Replace("\"", "");
@@ -42,11 +44,17 @@
bistroPath = bistroPath.Replace("\"", "");
}

- if (ndjangoPath != null)
- {
- if (!ndjangoPath.EndsWith("\\"))
- ndjangoPath += "\\";
- ndjangoPath = ndjangoPath.Replace("\"", "");
+ if (ndjangoPath35 != null)
+ {
+ if (!ndjangoPath35.EndsWith("\\"))
+ ndjangoPath35 += "\\";
+ ndjangoPath35 = ndjangoPath35.Replace("\"", "");
+ }
+ if (ndjangoPath40 != null)
+ {
+ if (!ndjangoPath40.EndsWith("\\"))
+ ndjangoPath40 += "\\";
+ ndjangoPath40 = ndjangoPath40.Replace("\"", "");
}

if (extenderPath != null)
@@ -57,8 +65,8 @@
}

if (FILE_PATH.EndsWith(".zip"))
- replaceDirZip(FILE_PATH, bistroPath, ndjangoPath,
extenderPath);
- else replaceDirFile(FILE_PATH, bistroPath, ndjangoPath,
extenderPath);
+ replaceDirZip(FILE_PATH, bistroPath,
ndjangoPath35,ndjangoPath40, extenderPath);
+ else replaceDirFile(FILE_PATH, bistroPath,
ndjangoPath35,ndjangoPath40, extenderPath);
}
catch (Exception ex)
{
@@ -74,7 +82,7 @@
/// <param name="bistroPath"></param>
/// <param name="ndjangoPath"></param>
/// <param name="extenderPath"></param>
- private static void replaceDirZip(string zipfile_PATH, string
bistroPath, string ndjangoPath, string extenderPath)
+ private static void replaceDirZip(string zipfile_PATH, string
bistroPath, string ndjangoPath35, string ndjangoPath40, string extenderPath)
{

ZipFile zipf =
ZipFile.Read(Path.GetFullPath(zipfile_PATH));
@@ -93,7 +101,8 @@
reader.Close();

content = content.Replace(BISTRODIR, (bistroPath ==
null) ? BISTRODIR : Path.GetFullPath(bistroPath)).
- Replace(NDJANGODIR, (ndjangoPath == null) ?
NDJANGODIR : Path.GetFullPath(ndjangoPath)).
+ Replace(NDJANGODIR35, (ndjangoPath35 == null) ?
NDJANGODIR35 : Path.GetFullPath(ndjangoPath35)).
+ Replace(NDJANGODIR40, (ndjangoPath40 == null) ?
NDJANGODIR40 : Path.GetFullPath(ndjangoPath40)).
Replace(EXTENDERDIR, (extenderPath == null) ?
EXTENDERDIR : Path.GetFullPath(extenderPath));

zipf.RemoveEntry(entry);
@@ -111,7 +120,7 @@
/// <param name="bistroPath"></param>
/// <param name="ndjangoPath"></param>
/// <param name="extenderPath"></param>
- private static void replaceDirFile(string FILE_PATH, string
bistroPath, string ndjangoPath, string extenderPath)
+ private static void replaceDirFile(string FILE_PATH, string
bistroPath, string ndjangoPath35,string ndjangoPath40, string extenderPath)
{
StreamReader reader = new StreamReader(FILE_PATH);
string content = reader.ReadToEnd();
@@ -119,7 +128,7 @@

//bistroPath =
Path.GetFullPath(bistroPath).Replace(Path.DirectorySeparatorChar,
Path.AltDirectorySeparatorChar);
//ndjangoPath =
Path.GetFullPath(ndjangoPath).Replace(Path.DirectorySeparatorChar,
Path.AltDirectorySeparatorChar);
- content = content.Replace(BISTRODIR,
bistroPath).Replace(NDJANGODIR, ndjangoPath).Replace(EXTENDERDIR,
extenderPath);
+ content = content.Replace(BISTRODIR,
bistroPath).Replace(NDJANGODIR35, ndjangoPath35).Replace(NDJANGODIR40,
ndjangoPath40).Replace(EXTENDERDIR, extenderPath);
File.WriteAllText(FILE_PATH, content);
}

=======================================
--- /Bistro/trunk/Bistro.SetupWiX/EditTemplates/versionWriter.exe Thu Apr
22 05:27:51 2010
+++ /Bistro/trunk/Bistro.SetupWiX/EditTemplates/versionWriter.exe Sat May
15 01:13:14 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Fri May 14 05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Setup.wxs Sat May 15 01:13:14 2010
@@ -15,10 +15,9 @@
<Upgrade Id="01918121-E286-4A36-AB78-6D7EBCE2C638">-->
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
<Upgrade Id="$(var.UpgradeCode)">
- <UpgradeVersion OnlyDetect="no" Property="PREVIOUSFOUND"
- Minimum="0.9.0" IncludeMinimum="yes"
- Maximum="0.9.2" IncludeMaximum="no" />
+ <UpgradeVersion Minimum="0.9.0" IncludeMinimum="yes"
Maximum="$(var.ProductVersion)" IncludeMaximum="yes" Language="1033"
Property="UPGRADEFOUND" />
</Upgrade>
+
<PropertyRef Id="NETFRAMEWORK35_SP_LEVEL" />
<Property Id="ALLUSERS" Value="1" />
<Property Id="ENVDIR_2008">
@@ -64,6 +63,21 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
<Directory Id="HILL30FILES" Name="Hill30">
+ <Directory Id="NDJANGODIR" Name="NDjango">
+ <Component Id="NDjangoMSI2008"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
+ <Condition><![CDATA[VS2010FOUND =
NULL]]></Condition>
+ <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net40" Name="InstallDir" Type="string"
Value="[NDJANGODIR]\.NET40" />
+ <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net35" Name="InstallDir" Type="string"
Value="[NDJANGODIR]\.NET35" KeyPath="yes" />
+ <File Id="NDJANGO08" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2008.msi" />
+ </Component>
+ <Component Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
+ <Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
+ <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net35" Name="InstallDir" Type="string"
Value="[NDJANGODIR]\.NET35" />
+ <RegistryValue Root="HKLM"
Key="Software\Hill30\NDjango\Net40" Name="InstallDir" Type="string"
Value="[NDJANGODIR]\.NET40" KeyPath="no" />
+ <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2010.msi" />
+ </Component>
+
+ </Directory>
<Directory Id="INSTALLDIR" Name="Bistro">
<Component Id="BistroAssemblies"
Guid="EA80C8A8-63BE-4D5E-BACB-9FA941CD0C7C">
<RemoveFolder Id="RemoveMain"
Directory="INSTALLDIR" On="uninstall" />
@@ -83,14 +97,7 @@
<Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
<File Id="NDjango.BistroIntegration2010.dll"
Name="NDjango.BistroIntegration2010.dll"
Source="lib\NDjango.BistroIntegration2010.dll"/>
</Component>
- <Component Id="NDjangoMSI2008"
Guid="05FCB39B-E868-42A4-B508-958EA17050A3">
- <Condition><![CDATA[VS2010FOUND =
NULL]]></Condition>
- <File Id="NDJANGO08" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2008.msi" />
- </Component>
- <Component Id="NDjangoMSI2010"
Guid="7D7CCB7A-68A4-4E05-AA89-5A985C680559">
- <Condition><![CDATA[VS2010FOUND <>
NULL]]></Condition>
- <File Id="NDJANGO10" Name="NDjangoSetup.msi"
Source="lib\NDjangoSetup2010.msi" />
- </Component>
+

<Component Id="ReadmeBistro"
Guid="2F2DC3B8-A256-4AF2-B1D9-20C89AF5645A">
<File Id="ReadmeBistro" Name="Readme.txt"
ShortName="README.TXT" Source="Readme.txt" />
@@ -226,7 +233,7 @@
</Feature>

<Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
- <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]\NDjangoSetup.msi"/>
+ <Property Id="WixShellExecTarget"
Value="[NDJANGODIR]\NDjangoSetup.msi"/>
<Property Id="NDJANGONEEDED" Value="1" />
<CustomAction Id="InstallNDjango" BinaryKey="WixCA"
DllEntry="WixShellExec" Impersonate="yes"/>
<CustomAction Id="DevenvSetup2008" Property="DEVENV_EXE_PATH2008"
ExeCommand="/setup" Impersonate="no" Execute="commit" />
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/CSharp.zip Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/CSharp.zip Sat May 15
01:13:14 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/FSharp.zip Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2008/FSharp.zip Sat May 15
01:13:14 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/CSharp.zip Sat May 15
01:13:14 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/Templates/VS2010/FSharp.zip Sat May 15
01:13:14 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Core.dll Fri Apr 30 05:13:47
2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Core.dll Sat May 15 01:13:14
2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/Bistro.Designer.dll Sat May 15
01:13:14 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Fri May 14
05:22:05 2010
+++ /Bistro/trunk/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Sat May 15
01:13:14 2010
Binary file, no diff available.
=======================================
--- /Bistro/trunk/Bistro.SetupWiX/versionWriterFull.exe Thu Apr 22 05:27:51
2010
+++ /Bistro/trunk/Bistro.SetupWiX/versionWriterFull.exe Sat May 15 01:13:14
2010
Binary file, no diff available.