Changeset 7

Timestamp:

02/25/06 13:18:02 (6 years ago)

Author:

mloar2

Message:

Modified schema to support dependencies.

Files:

• trunk/Makefile (modified) (3 diffs)
• trunk/WiptLib/src/Library.cs (modified) (3 diffs)
• trunk/WiptSchema.xsd (modified) (4 diffs)
• trunk/Wipt.sln (modified) (2 diffs)
• trunk/Wipt.wxs (modified) (1 diff)

trunk/Makefile

@@ -8 +8 @@
-        cd ..\wipt-get
-        nmake /$(MAKEFLAGS) wipt-get.exe
+        cd ..\wipt-gui
+        nmake /$(MAKEFLAGS) wipt-gui.exe
-        cd ..
-        -mkdir bin
@@ -13 +15 @@
-        copy /y wiptlib\wiptlib.dll bin
-        copy /y System.Installer\System.Installer.dll bin
+        copy /y wipt-gui\wipt-gui.exe bin
-
-wipt.msi: all
@@ -24 +27 @@
-
-clean:
+        -rmdir /s /q bin
-        -del Wipt.msi Wipt.wixobj
-        cd System.Installer

trunk/WiptLib/src/Library.cs

@@ -131 +131 @@
-
-  /// <remarks>
+  /// The Dependency class represents a dependency.
+  /// </remarks>
+  [Serializable()]
+    public class Dependency
+    {
+      public string productName;
+      public Version minVersion;
+      public Version maxVersion;
+
+      public Dependency(string ProductName)
+      {
+        productName = ProductName;
+      }
+    }
+
+  /// <remarks>
-  /// The Product class represents an installable product, such as rwho or
-  /// Wipt.
@@ -149 +165 @@
-      /// </summary> 
-      public Version develVersion;
-
+
+
+
-      public Transform[] transforms;
-
@@ -437 +455 @@
-                        );
-                    break;
+                  case "Dependency":
+                    Dependency d = new Dependency(e.GetAttribute("ProductName"));
+                    if(p.dependencies == null)
+                    {
+                      p.dependencies = new Dependency[1];
+                      p.dependencies[0] = d;
+                    }
+                    else
+                    {
+                      Dependency[] nd = new Dependency[p.dependencies.Length + 1];
+                      Array.Copy(p.dependencies, nd, p.dependencies.Length);
+                      nd[p.dependencies.Length] = d;
+                      p.dependencies = nd;
+                    }
+                    foreach(XmlElement t in e.ChildNodes)
+                    {
+                      switch(t.Name)
+                      {
+                        case "MinVersion":
+                          d.minVersion = new Version(
+                              t.GetAttribute("Major"),
+                              t.GetAttribute("Minor"),
+                              t.GetAttribute("Build")
+                              );
+                        break;
+                        case "MaxVersion":
+                          d.maxVersion = new Version(
+                              t.GetAttribute("Major"),
+                              t.GetAttribute("Minor"),
+                              t.GetAttribute("Build")
+                              );
+                        break;
+                      }
+                    }
+                    break;
-                  case "Package":
-                    Package a = new Package(e.GetAttribute("ProductCode"));

trunk/WiptSchema.xsd

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema targetNamespace="urn:xmlns:sigwin:wipt-get:repository" xmlns="urn:xmlns:sigwin:wipt-get:repository"
-2
+3
-        <xs:element name="Repository">
-                <xs:complexType>
@@ -16 +16 @@
-                        <xs:element name="StableVersion" type="Version" minOccurs="0" maxOccurs="1" />
-                        <xs:element name="DevelVersion" type="Version" minOccurs="0" maxOccurs="1" />
+      <xs:element name="Dependency" type="Dependency" minOccurs="0" maxOccurs="unbounded" />
-                        <xs:element name="Package" type="Package" maxOccurs="unbounded" />
-                        <xs:element name="Transform" type="Transform" minOccurs="0" maxOccurs="unbounded" />
@@ -38 +39 @@
-                <xs:attribute name="Minor" type="xs:int" />
-                <xs:attribute name="Build" type="xs:int" />
-    <xs:attribute name="MatchMode" type="xs:int" />
-        </xs:complexType>
+  <xs:complexType name="Dependency">
+    <xs:sequence>
+      <xs:element name="MinVersion" type="Version" minOccurs="0" maxOccurs="1" />
+      <xs:element name="MaxVersion" type="Version" minOccurs="0" maxOccurs="1" />
+    </xs:sequence>
+    <xs:attribute name="ProductName" type="xs:string" use="required" />
+  </xs:complexType>
-        <xs:complexType name="Package">
-                <xs:sequence>
@@ -49 +56 @@
-        <xs:complexType name="Transform">
-                <xs:sequence>
-
-
-
+
+
-                        <xs:element name="URL" type="xs:string" minOccurs="1" maxOccurs="unbounded" />
-                </xs:sequence>

trunk/Wipt.sln

@@ -5 +5 @@
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wipt-get", "wipt-get\wipt-get.csproj", "{CE4162CC-B0C4-4541-A37D-CF64301012D4}"
+        ProjectSection(ProjectDependencies) = postProject
+        EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WiptLib", "WiptLib\WiptLib.csproj", "{269B8A70-BEDB-4C36-BAB1-05E475F9C4EC}"
-        ProjectSection(ProjectDependencies) = postProject
-        EndProjectSection
@@ -22 +26 @@
-                {CE4162CC-B0C4-4541-A37D-CF64301012D4}.Release.ActiveCfg = Release|.NET
-                {CE4162CC-B0C4-4541-A37D-CF64301012D4}.Release.Build.0 = Release|.NET
+                {269B8A70-BEDB-4C36-BAB1-05E475F9C4EC}.Debug.ActiveCfg = Debug|.NET
+                {269B8A70-BEDB-4C36-BAB1-05E475F9C4EC}.Debug.Build.0 = Debug|.NET
+                {269B8A70-BEDB-4C36-BAB1-05E475F9C4EC}.Release.ActiveCfg = Release|.NET
+                {269B8A70-BEDB-4C36-BAB1-05E475F9C4EC}.Release.Build.0 = Release|.NET
-        EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution

trunk/Wipt.wxs

@@ -22 +22 @@
-              <RemoveFolder Id="ACMDataDirRemove" On="uninstall" Property="ACMDataDir" />
-                                                </Component>
-
+get
-                                                        <File Id="wiptget.exeFile" Name="WIPT-GET.EXE" DiskId="1" src="wipt-get\wipt-get.exe" Vital="yes" KeyPath="yes" />
-                                                        <Environment Id="UpdatePath" Name="PATH" Action="create" System="yes" Part="last" Value="[INSTALLDIR]" />
-                                                </Component>
+            <Component Id="WiptguiComponent" Guid="B4FCF30E-409C-45D4-81AE-CB41F0B88BF7">
+                                                        <File Id="wiptgui.exeFile" Name="WIPT-GUI.EXE" DiskId="1" src="wipt-gui\wipt-gui.exe" Vital="yes" KeyPath="yes" />
+            </Component>
-                                        </Directory>
-                                </Directory>