From: Robin Dunn <robin@alldunn.com>
Date: Fri, 29 Oct 1999 22:29:42 +0000 (+0000)
Subject: Fixed windows installer to not need a reboot and therefore not have
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/740c28d5e836a4cf17fcb3b7a2da533c0e7942ba

Fixed windows installer to not need a reboot and therefore not have
the bogus error message that freaked everybody out...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse
index 482b00435d..12daf50103 100644
--- a/utils/wxPython/distrib/wxPython.wse
+++ b/utils/wxPython/distrib/wxPython.wse
@@ -804,13 +804,6 @@ item: Check Disk Space
 end
 item: Remark
 end
-remarked item: If/While Statement
-  Variable=COMPONENTS
-  Value=A
-  Flags=00001010
-end
-remarked item: End Block
-end
 item: Install File
   Source=d:\WINNT\System32\Msvcirt.dll
   Destination=%SYS%\Msvcirt.dll
@@ -834,7 +827,7 @@ item: Install File
 end
 item: Install File
   Source=e:\Projects\wx\utils\wxPython\*.pyd
-  Destination=%MAINDIR%\wxPython\
+  Destination=%MAINDIR%\wxPython
   Description=wxPython extension modules
   Flags=0000000010000010
 end
@@ -864,7 +857,7 @@ item: Install File
 end
 item: Install File
   Source=E:\Projects\wx\utils\wxPython\demo\README.txt
-  Destination=%MAINDIR%\wxPython\demo
+  Destination=%MAINDIR%\wxPython\demo\README.txt
   Description=Demos
   Flags=0000000010000010
 end
@@ -962,25 +955,6 @@ item: Install File
 end
 item: Remark
 end
-remarked item: If/While Statement
-  Variable=COMPONENTS
-  Value=B
-  Flags=00001010
-end
-remarked item: Install File
-  Source=e:\projects\wx\docs\html\wx\*.*
-  Destination=%MAINDIR%\wxPython\docs
-  Description=wxPython documentation
-  Flags=0000000010000010
-end
-remarked item: Install File
-  Source=e:\projects\wx\docs\html\wx\wx.htm
-  Destination=%MAINDIR%\wxPython\docs\index.htm
-  Description=wxPython documentation
-  Flags=0000000010000010
-end
-remarked item: End Block
-end
 item: Remark
 end
 item: Remark
@@ -1132,17 +1106,13 @@ item: Set Variable
   Value=%GROUPDIR%\%GROUP%
 end
 item: Create Shortcut
-  Source=%UNINSTALL_PATH%
-  Destination=%CGROUPDIR%\%CGROUP_SAVE%\Uninstall %APPTITLE%.lnk
-  Command Options=%INST_LOG_PATH%
-  Icon Number=0
-end
-item: Create Shortcut
-  Source=pythonw.exe
+  Source=%PYTHONDIR%\pythonw.exe
   Destination=%CGROUPDIR%\%CGROUP_SAVE%\Run the DEMO.lnk
   Command Options=demo.py
   Working Directory=%MAINDIR%\wxPython\demo
   Icon Number=0
+  Key Type=1536
+  Flags=00000001
 end
 item: Create Shortcut
   Source=%MAINDIR%\wxPython\docs\wx.chm
@@ -1156,6 +1126,12 @@ item: Create Shortcut
   Key Type=1536
   Flags=00000001
 end
+item: Create Shortcut
+  Source=%UNINSTALL_PATH%
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\Uninstall %APPTITLE%.lnk
+  Command Options=%INST_LOG_PATH%
+  Icon Number=0
+end
 item: Else Statement
 end
 item: Add ProgMan Icon
diff --git a/utils/wxPython/distrib/wxPython.wsm b/utils/wxPython/distrib/wxPython.wsm
index 06a686b4af..32590e6db8 100644
Binary files a/utils/wxPython/distrib/wxPython.wsm and b/utils/wxPython/distrib/wxPython.wsm differ