From 65c2179d921fe0b6f423afd12f513aaa1cbcd4d0 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Fri, 17 Jun 2005 09:50:38 +0000
Subject: Use @macros for the version number displayed by the packager. Added
 the grphics demo program in the python package

---
 win/Tkzinc.wxs.in | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'win')

diff --git a/win/Tkzinc.wxs.in b/win/Tkzinc.wxs.in
index ae3de6f..86ee7c0 100644
--- a/win/Tkzinc.wxs.in
+++ b/win/Tkzinc.wxs.in
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
   <Product Name='Tkzinc' Id='918B6AC6-82C9-497F-B87C-498475CDC6ED'
-    Language='1033' Codepage='1252' Version='3.3.0' Manufacturer='CENA'>
+    Language='1033' Codepage='1252' Version='@MAJOR_VERSION@.@MINOR_VERSION@.@PATCHLEVEL@' Manufacturer='CENA'>
 
     <Package Id='????????-????-????-????-????????????' Keywords='Installer'
       Description="Tkzinc Installer for Active Tcl/Perl/Python"
@@ -66,16 +66,22 @@
           </Directory>
         </Directory>
         <Directory Id='PythonTclLib' Name='Lib'>
-	  <Directory Id='PythonTclLibZinc' Name='Zinc'>
+	        <Directory Id='PythonTclLibZinc' Name='Zinc'>
             <Component Id='PythonGlue' Guid='E2A2296C-0C53-40AB-9118-85706B5C2C42'>
-	      <File Id='ZincPy' Name='Zinc.py' DiskId='1' src='..\Python\library\Zinc.py' Vital='yes' />
-	      <File Id='ZincPkg' Name='__init__.py' DiskId='1' src='..\Python\library\__init__.py' Vital='yes' />
-	      <File Id='GraphicsPy' Name='graphics.py' DiskId='1' src='..\Python\library\graphics.py' Vital='yes' />
-	      <File Id='GeometryPy' Name='geometry.py' DiskId='1' src='..\Python\library\geometry.py' Vital='yes' />
-	      <File Id='PictorialPy' Name='pictorial.py' DiskId='1' src='..\Python\library\pictorial.py' Vital='yes' />
+	            <File Id='ZincPy' Name='Zinc.py' DiskId='1' src='..\Python\library\Zinc.py' Vital='yes' />
+	            <File Id='ZincPkg' Name='__init__.py' DiskId='1' src='..\Python\library\__init__.py' Vital='yes' />
+	            <File Id='GraphicsPy' Name='graphics.py' DiskId='1' src='..\Python\library\graphics.py' Vital='yes' />
+	            <File Id='GeometryPy' Name='geometry.py' DiskId='1' src='..\Python\library\geometry.py' Vital='yes' />
+	            <File Id='PictorialPy' Name='pictorl.py' LongName='pictorial.py' DiskId='1' src='..\Python\library\pictorial.py' Vital='yes' />
             </Component>
-	  </Directory>
-	</Directory>
+	        </Directory>
+	      </Directory>
+        <Directory Id='PythonZincDemo' Name='ZincDemo'>
+          <Component Id='PythonDemo' Guid='0BA2AABC-005C-4FFE-88A2-881F624E9C63'>
+	          <File Id='TestGraphicsPy' Name='testGrph.py' LongName='testGraphics.py' DiskId='1' src='..\Python\demos\testGraphics.py' Vital='yes' />
+	          <File Id='PaperGif' Name='paper.gif' DiskId='1' src='..\Python\demos\paper.gif' Vital='yes' />
+          </Component>
+	      </Directory>
       </Directory>
       <Directory Id='ACTIVE_TCL_DIR' Name='Tcl'>
         <Directory Id='ActiveTclLib' Name='lib'>
@@ -431,6 +437,7 @@
         <Condition Level='0'> NOT ACTIVE_PYTHON_VERSION = RequiredPythonVersion </Condition>
         <ComponentRef Id='PythonTcl' />
         <ComponentRef Id='PythonGlue' />
+        <ComponentRef Id='PythonDemo' />
       </Feature>
     </Feature>
 
-- 
cgit v1.1