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

1 view

Skip to first unread message

codesite...@google.com

unread,

May 19, 2010, 1:02:04 PM5/19/10

to bistro-d...@googlegroups.com

Revision: 451
Author: sasha_...@mail.ru
Date: Wed May 19 10:01:36 2010
Log: [No log message]
http://code.google.com/p/bistro-framework/source/detail?r=451

Added:
/Bistro/branches/v9.3.0.1
Deleted:

/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/BistroNHibernate.zip

/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/BistroProject.zip
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer.dll
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/NDjangoSetupExtended.msi
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.dll
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.pkgdef
Modified:
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroSetupWiX.wixproj
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/EditTemplates/Program.cs
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/EditTemplates/versionWriter.exe

/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/EditTemplates/versionWriterFull.exe
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Setup.wxs
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/versionWriterFull.exe

=======================================
---
/Bistro/tags/r9.3.0/Bistro.SetupWiX/Templates/VS2010/BistroNHibernate.zip
Fri Apr 16 03:44:25 2010
+++ /dev/null
File is too large to display a diff.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/Templates/VS2010/BistroProject.zip
Fri Apr 16 03:44:25 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/lib/Bistro.Designer.dll Sat May 15
01:13:14 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/lib/Bistro.Designer.pkgdef Fri May
14 05:22:05 2010
+++ /dev/null
@@ -1,36 +0,0 @@
-Windows Registry Editor Version 5.00
-
-[$RootKey$\InstalledProducts\DesignerPackage]
-@="#110"
-"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"ProductDetails"="#112"
-"PID"="1.0"
-"LogoID"="#400"
-[$RootKey$\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}]
-@="Bistro.Designer.DesignerPackage, Bistro.Designer, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null"
-"InprocServer32"="%windir%\\system32\\mscoree.dll"
-"Class"="Bistro.Designer.DesignerPackage"
-"Assembly"="Bistro.Designer, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=null"
-[$RootKey$\Packages\{40049e67-3a71-47c2-adfa-87b89aa56b50}]
-"ID"=dword:00000064
-"MinEdition"="Standard"
-"ProductVersion"="0.9"
-"ProductName"="Bistro Designer"
-"CompanyName"="Hill30 Inc"
-[$RootKey$\Projects\{94887830-9110-3f61-84ae-beea7891c7e6}]
-@="Factory"
-"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"ProjectTemplatesDir"="C:\\AIM\\Bistro\\branches\\WithMethodsEngine\\Bistro.Designer\\bin\\Debug\\.\\NullPath"
-"Language(VsTemplate)"="Bistro"
-[$RootKey$\NewProjectTemplates\TemplateDirs\{40049e67-3a71-47c2-adfa-87b89aa56b50}\/1]
-"SortPriority"=dword:00000064
-"TemplatesDir"="C:\\AIM\\Bistro\\branches\\WithMethodsEngine\\Bistro.Designer\\bin\\Debug\\.\\NullPath"
-[$RootKey$\Projects\{c39a00f4-b2a4-478e-a0b2-c3e69b3bd899}]
-@="Web Bistro Factory"
-"Package"="{40049e67-3a71-47c2-adfa-87b89aa56b50}"
-"Language(VsTemplate)"="Bistro"
-"ShowOnlySpecifiedTemplates(VsTemplate)"=dword:00000000
-"TemplateGroupIDs(VsTemplate)"="Web"
-[$RootKey$\Projects\{349c5851-65df-11da-9384-00065b846f21}\LanguageTemplates]
-"{f2a71f9b-5d33-465a-a702-920d77279786}"="{c39a00f4-b2a4-478e-a0b2-c3e69b3bd899}"
-
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/lib/NDjangoSetupExtended.msi Fri
Apr 30 05:13:47 2010
+++ /dev/null
File is too large to display a diff.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/lib/ProjectExtender2010.dll Sat May
15 03:38:04 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/lib/ProjectExtender2010.pkgdef Sat
May 15 03:38:04 2010
+++ /dev/null
@@ -1,67 +0,0 @@
-ÿþ[ $ R o o t K e y $ \ I n s t a l l e d P r o d u c t s \ P r o j e c t E x t e n d e r P a c k a g e ]
-
- @ = " # 1 1 0 "
-
- " P a c k a g e " = " { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } "
-
- " P I D " = " 1 . 0 "
-
- " P r o d u c t D e t a i l s " = " # 1 1 2 "
-
- " L o g o I D " = " # 4 0 0 "
-
- [ $ R o o t K e y $ \ P a c k a g e s \ { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } ]
-
- @ = " F S h a r p . P r o j e c t E x t e n d e r . P r o j e c t E x t e n d e r P a c k a g e ,
P r o j e c t E x t e n d e r 2 0 1 0 ,
V e r s i o n = 0 . 9 . 1 . 0 ,
C u l t u r e = n e u t r a l ,
P u b l i c K e y T o k e n = 8 8 2 d 0 f 1 4 f e 7 9 6 8 8 d "
-
- " I n p r o c S e r v e r 3 2 " = " $ W i n D i r $ \ s y s t e m 3 2 \ m s c o r e e . d l l "
-
- " C l a s s " = " F S h a r p . P r o j e c t E x t e n d e r . P r o j e c t E x t e n d e r P a c k a g e "
-
- " C o d e B a s e " = " $ P a c k a g e F o l d e r $ \ P r o j e c t E x t e n d e r 2 0 1 0 . d l l "
-
- [ $ R o o t K e y $ \ P a c k a g e s \ { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } ]
-
- " I D " = d w o r d : 0 0 0 0 0 0 6 4
-
- " M i n E d i t i o n " = " S t a n d a r d "
-
- " P r o d u c t V e r s i o n " = " 1 . 0 "
-
- " P r o d u c t N a m e " = " F # P r o j e c t S y s t e m
E x t e n d e r "
-
- " C o m p a n y N a m e " = " H i l l 3 0 I n c "
-
- [ $ R o o t K e y $ \ M e n u s ]
-
- " { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } " = " ,
1 0 0 0 ,
1 "
-
- [ $ R o o t K e y $ \ C L S I D \ { a 5 f c 3 b b d - 8 7 9 5 - 4 2 d 0 - a a 5 5 - e 6 5 f e 9 9 2 3 7 8 e } ]
-
- @ = " F S h a r p . P r o j e c t E x t e n d e r . P a g e "
-
- " I n p r o c S e r v e r 3 2 " = " $ W i n D i r $ \ s y s t e m 3 2 \ m s c o r e e . d l l "
-
- " C l a s s " = " F S h a r p . P r o j e c t E x t e n d e r . P a g e "
-
- " C o d e B a s e " = " $ P a c k a g e F o l d e r $ \ P r o j e c t E x t e n d e r 2 0 1 0 . d l l "
-
- " T h r e a d i n g M o d e l " = " B o t h "
-
- [ $ R o o t K e y $ \ P r o j e c t s \ { 5 b 8 9 f c c 2 - c 9 f 6 - 4 9 a 8 - 8 f 8 d - e d d c c 3 f d c 9 e 9 } ]
-
- @ = " F a c t o r y "
-
- " D i s p l a y N a m e " = " P r o j e c t E x t e n d e r "
-
- " P a c k a g e " = " { 5 a 8 f 5 a 4 d - d 1 e b - 4 0 3 e - 8 5 b 3 - 6 3 d f 6 0 7 f a 0 7 c } "
-
- " P r o j e c t T e m p l a t e s D i r " = " $ P a c k a g e F o l d e r $ \ . \ N u l l P a t h "
-
- " L a n g u a g e ( V s T e m p l a t e ) " = " F S h a r p "
-
-
-
-
-
-
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/BistroSetupWiX.wixproj Sat May 15
03:38:04 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/BistroSetupWiX.wixproj Wed
May 19 10:01:36 2010
@@ -70,5 +70,6 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
+ <PostBuildEvent>copy /y $(Projectdir)$(OutDir)Bistro.msi "C:\Documents
and Settings\avlasova\My Documents\Share"</PostBuildEvent>
</PropertyGroup>
</Project>
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/EditTemplates/Program.cs Sat May 15
01:13:14 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/EditTemplates/Program.cs Wed
May 19 10:01:36 2010
@@ -1,3 +1,4 @@
+
using System;
using System.Collections.Generic;
using System.Text;
@@ -20,20 +21,28 @@

/// <summary>
- /// The program search through the registry for specified value to
get the corresponding installation path
+ /// If defined regkeys The program search through the registry for
specified value to get the corresponding installation path
/// Once found, it replaces the special values like [BISTRODIR] in
project files with retrieved paths.
/// </summary>
- /// <param name="args">only one argument - template path</param>
+ /// <param name="args">0 - template path,1-BISTRO,2-NDJANGO
2008,3-NDJANGO 2010,4 - F# Project Extender</param>
static void Main(string[] args)
{
try
{
- String FILE_PATH = args[0];
-
- String bistroPath =
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\Bistro").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");
+ String FILE_PATH; //= args[0];
+ String bistroPath ;//=
(String)Registry.LocalMachine.CreateSubKey(@"Software\Hill30\Bistro").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");
+ if (args.Length == 5)
+ {
+ FILE_PATH = args[0];
+ bistroPath = args[1];
+ ndjangoPath35 = args[2];
+ ndjangoPath40 = args[3];
+ extenderPath = args[4];
+ }
+ else return;

FILE_PATH = FILE_PATH.Replace("\"", "");

=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/EditTemplates/versionWriter.exe Sat
May 15 01:13:14 2010
+++
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/EditTemplates/versionWriter.exe
Wed May 19 10:01:36 2010
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/EditTemplates/versionWriterFull.exe
Sat May 15 03:38:04 2010
+++
/Bistro/branches/v9.3.0.1/Bistro.SetupWiX/EditTemplates/versionWriterFull.exe
Wed May 19 10:01:36 2010
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/Setup.wxs Sat May 15 03:38:04 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Setup.wxs Wed May 19 10:01:36
2010
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define ProductVersion="0.9.3" ?>
- <?define ProductVersionTitle="0.9.3.0" ?>
+ <?define ProductVersion="0.9.3.1" ?>
+ <?define ProductVersionTitle="0.9.3.1" ?>
<?define VisualStudioRegistryRoot2008
= "Software\Microsoft\VisualStudio\9.0" ?>
<?define VisualStudioRegistryRoot2010
= "Software\Microsoft\VisualStudio\10.0" ?>
<?define UpgradeCode="{E63B2D78-54C6-4d2a-B3EF-219EF3AE8FBC}"?>
- <Product Id="B0655900-8078-4342-8CA0-AB5A8583C5A3" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
+ <Product Id="025811B6-BD51-4BAC-90F1-8E42D11D9B90" Name="Bistro
$(var.ProductVersionTitle)" Language="1033" Version="$(var.ProductVersion)"
Manufacturer="Hill30" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="200" Compressed="yes" />

<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@@ -27,7 +27,7 @@
<RegistrySearch Id="RL_EnvironmentDir_2010" Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS"
Name="EnvironmentDirectory" Type="directory" />
</Property>
<Property Id="EXTENSIONSHILL30FILES">
- <DirectorySearch Id="hill30filessearch"
Path="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill 30\"
/>
+ 
</Property>
<Property Id="VS2008FOUND">
<RegistrySearch Id="VS2008found" Type="raw" Root="HKLM"
Key="Software\Microsoft\VisualStudio\9.0" Name="InstallDir" />
@@ -54,6 +54,9 @@
<RegistrySearch Id="RegSearch_DevenvExe_Path2010" Root="HKLM"
Key="$(var.VisualStudioRegistryRoot2010)\Setup\VS" Name="EnvironmentPath"
Type="raw" />
</Property>
<Property Id="VSIX_PATH"/>
+ <Property Id="MVCFOUND">
+ <RegistrySearch Id="MVCfound" Type="raw" Root="HKLM"
Key="SOFTWARE\Microsoft\ASP.NET MVC 2\Runtime" Name="InstallPath" />
+ </Property>

<Condition Message="This application requires Visual Studio
2008/2010. Please install the Visual Studio IDE then run this installer
again.">Installed OR VS2008FOUND OR VS2010FOUND</Condition>
<Condition Message="This application requires .NET Framework
3.5SP1. Please install the .NET Framework 3.5SP1 then run this installer
again."><![CDATA[Installed OR (NETFRAMEWORK35_SP_LEVEL and NOT
NETFRAMEWORK35_SP_LEVEL = "#0")]]></Condition>
@@ -62,26 +65,20 @@
<WixVariable Id="WixUIDialogBmp" Value="bitmaps\dlgbmp.bmp" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
- <Directory Id="HILL30FILES" Name="Hill30">
- <Directory Id="NDJANGODIR" Name="NDjango">
+ <Directory Id="INSTALLDIR" Name="Hill30">
+
+ <Directory Id="BistroDir" Name="Bistro">
<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" />
- <RegistryValue Root="HKLM"
Key="Software\Hill30\Bistro" Name="InstallDir" Type="string"
Value="[INSTALLDIR]" KeyPath="yes" />
+ 
<File Id="Bistro.Core.dll"
Name="Bistro.Core.dll" Source="lib\Bistro.Core.dll" DiskId="1" />
<File Id="Bistro.Extensions.dll"
Name="Bistro.Extensions.dll" Source="lib\Bistro.Extensions.dll" DiskId="1"
/>
<File Id="Bistro.FSharpExtensions.dll"
Name="Bistro.FSharpExtensions.dll" Source="lib\Bistro.FSharpExtensions.dll"
/>
@@ -232,20 +229,22 @@
<ComponentRef Id="NDjangoMSI2010"/>
</Feature>

- <Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
- <Property Id="WixShellExecTarget"
Value="[NDJANGODIR]\NDjangoSetup.msi"/>
<Property Id="NDJANGONEEDED" Value="1" />
+ <Binary Id="EditTemplates" SourceFile="versionWriterFull.exe" />
+ <Property Id="WixShellExecTarget"
Value="[INSTALLDIR]Bistro\NDjangoSetup.msi"/>
<CustomAction Id="InstallNDjango" BinaryKey="WixCA"
DllEntry="WixShellExec" Impersonate="yes"/>
+ 
<CustomAction Id="DevenvSetup2008" Property="DEVENV_EXE_PATH2008"
ExeCommand="/setup" Impersonate="no" Execute="commit" />
<CustomAction Id="DevenvSetup2010" Property="DEVENV_EXE_PATH2010"
ExeCommand="/setup" Impersonate="no" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]CSharp2008.zip""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip""
Id="EditFSharp2008CustomAction" Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
- <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip""
Id="EditFSharp2010CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]CSharp2008.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender""
Id="EditBistroProject2008CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2008]FSharp2008.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender"" Id="EditFSharp2008CustomAction"
Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]CSharp2010.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender""
Id="EditBistroProject2010CustomAction" Return="ignore" Execute="commit" />
+ <CustomAction BinaryKey="EditTemplates"
ExeCommand=""[ProjectTemplatesBistro2010]FSharp2010.zip"
"[INSTALLDIR]Bistro" "[INSTALLDIR]NDjango\.NET35"
"[INSTALLDIR]NDjango\.NET40"
"[INSTALLDIR]ProjectExtender"" Id="EditFSharp2010CustomAction"
Return="ignore" Execute="commit" />

- <CustomAction Id="InstallExtender2010" Property = "VSIX_PATH"
ExeCommand=""[INSTALLDIR]\ProjectExtender2010.vsix""
Return="check" Execute="deferred" />
- <CustomAction Id="InstallBistroDesigner2010" Property
= "VSIX_PATH"
ExeCommand=""[INSTALLDIR]\BistroDesigner2010.vsix""
Return="check" Execute="deferred"/>
+ <CustomAction Id="InstallExtender2010" Property = "VSIX_PATH"
ExeCommand="/q "[INSTALLDIR]Bistro\ProjectExtender2010.vsix""
Return="ignore" Execute="deferred" />
+ <CustomAction Id="InstallBistroDesigner2010" Property
= "VSIX_PATH" ExeCommand="/q
"[INSTALLDIR]Bistro\BistroDesigner2010.vsix"" Return="ignore"
Execute="deferred"/>
<CustomAction Id="SetExtensionDir" Property="EXTENSIONHILL30FILES"
Value="[LocalAppDataFolder]\Microsoft\VisualStudio\10.0\Extensions\Hill30
Inc"/>
<CustomAction Id="DeleteExtender2010" Directory = "INSTALLDIR"
ExeCommand=""cmd.exe" /c rmdir /s /q
"[EXTENSIONHILL30FILES]\F# Project System Extender""
Return="ignore"/>
<CustomAction Id="DeleteDesigner2010" Directory = "INSTALLDIR"
ExeCommand=""cmd.exe" /c rmdir /s /q
"[EXTENSIONHILL30FILES]\Bistro Designer"" Return="ignore"/>
@@ -269,6 +268,8 @@
<Custom Action="DeleteDesigner2010"
After="DeleteExtender2010"><![CDATA[REMOVE]]></Custom>

<Custom Action="InstallNDjango"
After="InstallFinalize"><![CDATA[(Not Installed OR (Installer AND REMOVE
<> "ALL")) AND NDJANGONEEDED]]></Custom>
+ 
</InstallExecuteSequence>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />

@@ -301,6 +302,7 @@
<Publish Dialog="InstallDirDlgCustom" Control="Next"
Event="NewDialog" Value="VerifyReadyDlg"
Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID="1"]]></Publish>
<Publish Dialog="InstallDirDlgCustom" Control="ChangeFolder"
Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
<Publish Dialog="InstallDirDlgCustom" Control="ChangeFolder"
Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
<Publish Dialog="VerifyReadyDlg" Control="Back"
Event="NewDialog" Value="InstallDirDlgCustom" Order="1">NOT
Installed</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back"
Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed</Publish>
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next"
Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
@@ -336,8 +338,6 @@
<Control Id="ChangeFolder" Type="PushButton" X="20"
Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)">
</Control>
<Control Type="CheckBox" Id="NDjangoCheckBox" Width="230"
Height="17" X="22" Y="169" Property="NDJANGONEEDED" CheckBoxValue="Yes"
Text="Install NDjango">
- 
</Control>
<Control Type="Text" Id="NDjangoNote" Width="350"
Height="17" X="20" Y="190" Text="NOTE: You will not able to use Bistro
applications with .django views without NDjango" />
</Dialog>
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/Templates/VS2010/CSharp.zip Sat May
15 01:13:14 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/CSharp.zip
Wed May 19 10:01:36 2010
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/Templates/VS2010/FSharp.zip Sat May
15 01:13:14 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/Templates/VS2010/FSharp.zip
Wed May 19 10:01:36 2010
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/lib/Bistro.Designer2008.dll Sat May
15 03:38:04 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/Bistro.Designer2008.dll
Wed May 19 10:01:36 2010
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/lib/BistroDesigner2010.vsix Sat May
15 03:38:04 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/BistroDesigner2010.vsix
Wed May 19 10:01:36 2010
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/lib/ProjectExtender2010.vsix Fri
May 14 05:22:05 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/lib/ProjectExtender2010.vsix
Wed May 19 10:01:36 2010
Binary file, no diff available.
=======================================
--- /Bistro/tags/r9.3.0/Bistro.SetupWiX/versionWriterFull.exe Sat May 15
01:13:14 2010
+++ /Bistro/branches/v9.3.0.1/Bistro.SetupWiX/versionWriterFull.exe Wed May
19 10:01:36 2010
Binary file, no diff available.

Reply all

Reply to author

Forward

0 new messages