--- a/build/win32/installer/README.txt	Mon Jan 18 17:52:56 2010 +0000
+++ b/build/win32/installer/README.txt	Tue Jan 19 17:45:49 2010 +0000
@@ -1,15 +1,15 @@
 To create the installer you must have Inno Setup Compiler >= 5.3 installed.
 
 Then follow this procedure:
-1. Check out a clean copy of fife trunk into the same directory as the installer.
-2. Rename the directory from "trunk" to "fife"
-3. Install the Win32 SDK
-4. Build FIFE
-5. Compile the installer (right click fife.iss -> Compile)
+1. Check out a clean copy of fife trunk.
+2. Build FIFE (ensure that the required DLLs get copied to <FIFE>\trunk\engine\python\fife)
+3. From the <FIFE>\trunk directory execute the command 'python setup.py bdist_wininst' to build the python module installer.
+4. Compile the FIFE installer (right click fife.iss -> Compile)
 
 You should now have a working installer called FIFE {VERSION}.
 
 Now that you have the working copy set up, all you have to do to create a new installer is:
 1. Update the fife directory (svn update)
 2. Recompile FIFE
-3. Compile the installer
+3. Run 'python setup.py bdist_wininst' to create the python module installer
+3. Compile the FIFE installer

--- a/build/win32/installer/fife.iss	Mon Jan 18 17:52:56 2010 +0000
+++ b/build/win32/installer/fife.iss	Tue Jan 19 17:45:49 2010 +0000
@@ -1,77 +1,70 @@
-; TODO:
-;   * Check that ActivePython 2.5 is installed?
-;   * Run oalinst.exe if openal DLL is not installed?
-;   * Test that the installer works as non-admin on xp, vista and win7
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{82F36A38-DEDD-4B1C-8772-246886235B27}
-AppName=FIFE
-AppVerName=FIFE 2009.1
-AppPublisher=FIFE team
+AppId={{99CDEFC4-8CC3-410A-ABB9-FC58F61DF70E}
+AppName=FIFE 0.3.0
+; Version is yyyy.mm
+AppVerName=FIFE 0.3.0
+AppPublisher=FIFE Team
 AppPublisherURL=http://www.fifengine.de/
 AppSupportURL=http://www.fifengine.de/
 AppUpdatesURL=http://www.fifengine.de/
-DefaultDirName={pf}\FIFE
+DefaultDirName={pf}\FIFE\
 DefaultGroupName=FIFE
+DirExistsWarning=No
+EnableDirDoesntExistWarning=Yes
 AllowNoIcons=yes
 LicenseFile=license.rtf
 Compression=lzma
 SolidCompression=yes
-OutputBaseFilename=FIFE 2009.1
+OutputBaseFilename=FIFE_0_3_0_installer_win32
 OutputDir=.
 DisableReadyPage=yes
-; This will require some testing. We can't install to Program files if the user is not an admin.
-; PrivilegesRequired=none
 
 [Types]
 Name: "full"; Description: "Full installation"
-Name: "compact"; Description: "Compact installation"
-Name: "custom"; Description: "Custom installation"; Flags: iscustom
+Name: "fife-only"; Description: "Engine only"
+Name: "fife-demos"; Description: "Engine and Demos"
+Name: "fife-tools"; Description: "Engine and Tools"
 
 [Components]
-Name: "main"; Description: "Main Files"; Types: full compact custom; Flags: fixed
-Name: "source"; Description: "Source code"; Types: full compact
-Name: "source\sdk"; Description: "Source Developer Kit"; Types: full
-Name: "clients"; Description: "Clients"; Types: full
-Name: "clients\editor"; Description: "Editor"; Types: full compact
-Name: "clients\rio_de_hola"; Description: "Rio de hola techdemo"; Types: full
-Name: "clients\pychan_demo"; Description: "Pychan demonstration"; Types: full
+Name: "engine"; Description: "FIFE python module"; Types: full fife-only fife-demos fife-tools; Flags: fixed
+Name: "demos"; Description: "Demos"; Types: full fife-demos
+Name: "tools"; Description: "Tools"; Types: full fife-tools
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-; Main
-Source: "fife\*"; DestDir: "{app}"; Excludes: ".svn,*.o,*.pyc,\clients,\ext,\build,\utils,\engine\core"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "fife\doc\README"; DestDir: "{app}\doc\"; DestName:"Readme.txt"; Flags: isreadme
-Source: "fife\doc\AUTHORS"; DestDir: "{app}\doc\"; DestName:"Authors.txt"
-Source: "fife\doc\COPYING"; DestDir: "{app}\doc\"; DestName:"Copying.txt"
 
-; Source
-Source: "fife\engine\core\*"; DestDir: "{app}\engine\core"; Excludes: ".svn,*.o,*.pyc"; Components: source; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "fife\build\*"; DestDir: "{app}\build"; Excludes: ".svn,*.o,*.pyc,\win32\applications,\win32\binaries,\win32\includes,\win32\static_libs"; Components: source; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "fife\utils\*"; DestDir: "{app}\utils"; Excludes: ".svn,*.o,*.pyc"; Components: source; Flags: ignoreversion recursesubdirs createallsubdirs
-; We can probably drop this in the windows installer, saving some space
-;Source: "fife\ext\*"; DestDir: "{app}\ext"; Excludes: ".svn,*.o,*.pyc"; Components: source; Flags: ignoreversion recursesubdirs createallsubdirs
+; engine
+Source: "..\..\..\dist\*.exe"; DestDir: "{app}\engine"; Excludes: ".svn"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\..\AUTHORS"; DestDir: "{app}\doc\"; DestName:"Authors.txt"
+Source: "..\..\..\COPYING"; DestDir: "{app}\doc\"; DestName:"Copying.txt"
+Source: "..\..\..\CHANGES"; DestDir: "{app}\doc\"; DestName:"Changes.txt"
+Source: "..\..\..\README"; DestDir:"{app}"; DestName: "README.txt"; Flags: isreadme
 
-; SDK
-Source: "fife\build\win32\applications\*"; DestDir: "{app}\build\win32\applications"; Excludes: ".svn,*.o,*.pyc"; Components: source\sdk; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "fife\build\win32\binaries\*"; DestDir: "{app}\build\win32\binaries"; Excludes: ".svn,*.o,*.pyc"; Components: source\sdk; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "fife\build\win32\includes\*"; DestDir: "{app}\build\win32\includes"; Excludes: ".svn,*.o,*.pyc"; Components: source\sdk; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "fife\build\win32\static_libs\*"; DestDir: "{app}\build\win32\static_libs"; Excludes: ".svn,*.o,*.pyc"; Components: source\sdk; Flags: ignoreversion recursesubdirs createallsubdirs
+; demos
+Source: "..\..\..\demos\*"; DestDir: "{app}\demos"; Excludes: ".svn"; Flags: ignoreversion recursesubdirs createallsubdirs
 
-; Clients
-Source: "fife\clients\editor\*"; DestDir: "{app}\clients\editor"; Excludes: ".svn,*.o,*.pyc"; Components: clients\editor; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "fife\clients\rio_de_hola\*"; DestDir: "{app}\clients\rio_de_hola"; Excludes: ".svn,*.o,*.pyc"; Components: clients\rio_de_hola; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "fife\clients\pychan_demo\*"; DestDir: "{app}\clients\rio_de_hola"; Excludes: ".svn,*.o,*.pyc"; Components: clients\pychan_demo; Flags: ignoreversion recursesubdirs createallsubdirs
+; tools
+Source: "..\..\..\tools\*"; DestDir: "{app}\tools"; Excludes: ".svn"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
 Name: "{group}\{cm:ProgramOnTheWeb,FIFE}"; Filename: "http://www.fifengine.de/"
+Name: "{group}\Copying.txt"; Filename: "notepad.exe"; Parameters: "{app}\doc\Copying.txt"
+Name: "{group}\Changes.txt"; Filename: "notepad.exe"; Parameters: "{app}\doc\Changes.txt"
+Name: "{group}\tools\Map Editor"; Filename: "python.exe"; Parameters: """{app}\tools\editor\run.py"""; WorkingDir: "{app}\tools\editor"; Comment: "FIFE Editor"; Components: "tools"
+Name: "{group}\demos\Rio de hola"; Filename: "python.exe"; Parameters: """{app}\demos\rio_de_hola\run.py"""; WorkingDir: "{app}\demos\rio_de_hola"; Comment: "Techdemo"; Components: "demos"
+Name: "{group}\demos\Pychan demo"; Filename: "python.exe"; Parameters: """{app}\demos\pychan_demo\pychan_test.py"""; WorkingDir: "{app}\demos\pychan_demo"; Comment: "FIFE GUI demo"; Components: "demos"
 Name: "{group}\{cm:UninstallProgram,FIFE}"; Filename: "{uninstallexe}"
-Name: "{group}\FIFEdit"; Filename: "{app}\clients\editor\run.py"; WorkingDir: "{app}\clients\editor"; Comment: "FIFE Editor"; Components: "clients\editor"
-Name: "{group}\Rio de hola"; Filename: "{app}\clients\rio_de_hola\run.py"; WorkingDir: "{app}\clients\rio_de_hola"; Comment: "Techdemo"; Components: "clients\rio_de_hola"
-Name: "{group}\Pychan demo"; Filename: "{app}\clients\pychan_demo\pychan_test.py"; WorkingDir: "{app}\clients\pychan_demo"; Comment: "FIFE GUI demo"; Components: "clients\pychan_demo"
 
+[Run]
+Filename: "{app}\engine\fife-0.3.0.win32.exe";
+
+
+