Changeset 4

Timestamp:

02/20/06 21:36:17 (6 years ago)

Author:

mloar2

Message:

I don't know what I changed.

Files:

• trunk/Makefile (modified) (1 diff)
• trunk/System.Installer/Makefile (modified) (1 diff)
• trunk/System.Installer/System.Installer.cpp (modified) (1 diff)
• trunk/System.Installer/System.Installer.h (modified) (1 diff)
• trunk/wipt-get/Makefile (modified) (1 diff)
• trunk/wipt-get/src/Main.cs (modified) (13 diffs)
• trunk/WiptLib/Makefile (modified) (1 diff)
• trunk/WiptLib/src/Library.cs (modified) (1 diff)

trunk/Makefile

@@ -17 +17 @@
-        candle /nologo wipt.wxs
-        light /nologo wipt.wixobj
+!IF "$(FRAMEWORKVERSION)"=="v1.1.4322"
-        signcode -cn "Special Interest Group for Windows Development" wipt.msi
+!ELSE
+        signtool sign /n "Special Interest Group for Windows Development" wipt.msi
+!ENDIF
-
-clean:

trunk/System.Installer/Makefile

@@ -3 +3 @@
-System.Installer.dll: System.Installer.obj AssemblyInfo.obj
-        link /OUT:System.Installer.dll /INCREMENTAL:NO /NOLOGO /DLL /FIXED:No nochkclr.obj mscoree.lib msi.lib kernel32.lib System.Installer.obj
+!IF "$(FRAMEWORKVERSION)"=="v1.1.4322"
-        signcode -cn "Special Interest Group for Windows Development" System.Installer.dll
+!ELSE
+        signtool sign /n "Special Interest Group for Windows Development" System.Installer.dll
+!ENDIF
-
-System.Installer.obj: StdAfx.pch System.Installer.cpp

trunk/System.Installer/System.Installer.cpp

@@ -428 +428 @@
-          return ret;
-        }
+
+        Guid ApplicationDatabase::GetPackageUpgradeCode(String* path)
+        {
+          return Guid::Empty;
+        }
-      }
-    }

trunk/System.Installer/System.Installer.h

@@ -68 +68 @@
-            static InstallState getProductState(Guid productCode);
-            static int ExecuteHandler(UINT iMessageType, LPCTSTR message);
+            static Guid GetPackageUpgradeCode(String* path);
-          private:
-            static ProgressHandler* handler;

trunk/wipt-get/Makefile

@@ -3 +3 @@
-wipt-get.exe: src\Main.cs src\AssemblyInfo.cs res\App.ico ..\System.Installer\System.Installer.dll ..\WiptLib\WiptLib.dll
-        csc /nologo $(DEBUG) /optimize /Win32Icon:res\App.ico /r:..\System.Installer\System.Installer.dll /r:..\WiptLib\WiptLib.dll /out:wipt-get.exe src\Main.cs src\AssemblyInfo.cs
+!IF "$(FRAMEWORKVERSION)"=="v1.1.4322"
-        signcode -cn "Special Interest Group for Windows Development" wipt-get.exe
+!ELSE
+        signtool sign /n "Special Interest Group for Windows Development" wipt-get.exe
+!ENDIF
-
-clean:

trunk/wipt-get/src/Main.cs

@@ -51 +51 @@
-        bool devel = false;
-        bool ignoretransforms = false;
+        bool batch = false;
-        string command = "";
-        string packages = "";
@@ -58 +59 @@
-          switch(arg.ToLower())
-          {
+            case "--batch":
+              batch = true;
+            break;
-            case "--devel":
-              devel = true;
@@ -75 +79 @@
-        if(command == "")
-        {
-
+Error.
-          Usage();
-          return;
@@ -82 +86 @@
-        if((command == "install" || command == "remove") && packages == "")
-        {
-
+Error.
-          Usage();
-          return;
@@ -90 +94 @@
-        {
-          case "install":
-
+, batch
-          break;
-          case "remove":
@@ -112 +116 @@
-
-    private static void Install(string[] packages, bool devel,
-
+, bool batch
-    {
-      foreach(string p in packages)
@@ -124 +128 @@
-          if(obj == null)
-          {
-
+Error.
-            continue;
-          }
-          else if(obj is Suite)
-          {
-
+, batch
-            continue;
-          }
@@ -144 +148 @@
-          if(instVersion == null)
-          {
-
+Error.
-                + product.name);
-            continue;
@@ -167 +171 @@
-          if(URL == "")
-          {
-
+Error.
-                + product.name + ".  Contact the repository maintainer.");
-            continue;
@@ -176 +180 @@
-              && state != InstallState.Unknown)
-          {
-
+Error.
-            continue;
-          }
@@ -206 +210 @@
-          if(ret != 0)
-          {
-
+Error.
-                "Error code {0} returned from installProduct for "
-                + product.name,ret);
-
+Error.
-          }
-        }
@@ -220 +224 @@
-
-    private static void InstallSuite(Suite suite, bool devel,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        c = Console.ReadLine();
-
-
-
-
+
+
+
+
+
+
+
+
+
-      }
-    }
@@ -329 +337 @@
-        Usage:  wipt-get [options] <command> <product>[ <product> <product> ...]
-        OPTIONS
+        --batch                     Don't ask any questions
-        --devel                     Install development version
-        --ignore-transforms         Don't apply transforms listed in repository

trunk/WiptLib/Makefile

@@ -3 +3 @@
-WiptLib.dll: src\Library.cs src\AssemblyInfo.cs
-        csc /nologo $(DEBUG) /optimize /target:library /doc:WiptLib.xml /out:WiptLib.dll src\Library.cs src\AssemblyInfo.cs
+!IF "$(FRAMEWORKVERSION)"=="v1.1.4322"
-        signcode -cn "Special Interest Group for Windows Development" WiptLib.dll
+!ELSE
+        signtool sign /n "Special Interest Group for Windows Development" WiptLib.dll
+!ENDIF
-
-clean:

trunk/WiptLib/src/Library.cs

@@ -110 +110 @@
-            || ((v1.major == v2.major) && (v1.minor == v2.minor) && (v1.build < v2.build));
-      }
-
-
-
+
+
+
+
+
+
+
+
+
-      }
-      public static bool operator >(Version v1, Version v2)
-      {
-        return !((v1 < v2) || (v1 == v2));
-      }
-      public static bool operator !=(Version v1, Version v2)
-      {
-        return !(v1 == v2);
-      }
-    }