- Removed the rarfile for the fonts on windows and keeping the fonts directly on svn

- New input file for py2exe
- Clearer instructions about the setup, translated in english



git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@245 014f5005-505e-4b48-8d0a-63407b615a7c

windows/README.txt

@@ -0,0 +1,25 @@
+Requirements:
+1)Python 2.6;
+2)PyQt for python 2.6 (it should already include the qt libs);
+3)Py2exe
+4)Innosetup
+
+It might be necessary to have the: Microsoft Visual C++ 2008 Redistributable Package, because python 2.6 uses it and it's not installed by default in windows.
+
+
+	Create an exe file
+- Move the file windows/input.py to ../
+- Chech that the version number is correct
+- Execute "python input.py py2exe"
+
+At the end, there should be a directory named "dist" containing the exe file and the needed libs (excluding for the c++ one)
+
+	Create the setup with Inno Setup
+- Move windows/ss.iss to ../
+- Open ss.iss with Inno Setup, Build and Compile
+
+A directory named "Output" will be created, which will contain the installer.
+
+Notes:
+- To create the setup, don't move the "dist" directory or its content.
+- Do not delete or move the directory windows/font dejavu

windows/Wiki For Winows ITA.txt

@@ -1,40 +0,0 @@
-Installare:
-1)Python consigliabile 2.5;
-2)Qt 4 o superiore;
-3)PyQt per python 2.5;
-4)Py2exe;
-
-Scompattare font dejavu nella sottocartella \font dejavu (es :...\relational_trunk\windows\font dejavu\)
-e successivamente installarli;
-
-Crare un file exe per windows:
-
-1)Copiare il file relational_gui.py nella stessa cartella e rinominarlo come input.py;
-2)Aprire il file input.py con l'IDLE ed aggiungere:
-	
-	from distutils.core import setup
-	import py2exe
-	setup(windows=[{"script": "relational_gui.py","icon_resources": [(0, "windows/favicon.ico")]}])
-
-  e salvare;
-
-3)Ora aprite "Esegui..." trascinateci il file input.py dentro, poi a destra dell'indirizzo di input.py (fuori le virgolette),
-  digitate uno spazio e poi py2exe, date OK *;
-
-
-*appariranno molte stringhe, poi si aprirà Relational.
-
-Ecco comparse 2 cartelle, Build, che potete cancellarla,Dist,contenente il file .exe relational_gui.exe,
-potete cancellare il file input.py.
-
-Dopo aver seguito tutti i passi precedenti ecco come creare un setup con Inno Setup:
-
-1)Scaricare ed Installare Inno Setup;
-2)Spostare il file ss.iss nella cartella centrale (es: ...\relational_trunk\);
-3)Aprire il file ss.iss , Build e Compile;
-
-Verra' creata una cartella Output, contenente il RelationalSetup.exe .
-
-N.B.
-Per creare il setup, non spostare la cartella dist dalla directory d'origine, 
-e non eliminare la cartella font dejavu dalla directory d'origine.

windows/input.py

@@ -4,7 +4,7 @@
 # Relational
 # Copyright (C) 2008  Salvo "LtWorf" Tomaselli
 # 
-# Relation is free software: you can redistribute it and/or modify
+# Relational is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
@@ -18,42 +18,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
+
 from distutils.core import setup
 import py2exe
-#setup(console=['relational_gui.pyw'])
-#setup(windows=['relational_gui.py'])
-setup(windows=[{"script": "relational_gui.py","icon_resources": [(0, "favicon.ico")]}])
-
-import sys
-import sip
-from PyQt4 import QtCore, QtGui
-from relational_gui import maingui, about
-from relational import relation, parser
-
-
-version="0.10"
-about.version=version
-
-if __name__ == "__main__":
-    if len (sys.argv) > 1 and sys.argv[1] == "-v":
-        print version
-        sys.exit(0)
-        
-    try:
-        import psyco
-        psyco.full()
-    except:
-        pass
-            
-    app = QtGui.QApplication(sys.argv)
-    Form = QtGui.QWidget()
-    
-
-    Form.setFont(QtGui.QFont("Dejavu Sans Bold"))
-    
-
-    ui = maingui.Ui_Form()
-    ui.setupUi(Form)
-    Form.show()
-    
-    sys.exit(app.exec_())
+setup(windows=
+      [
+          {"script": "relational_gui.py","icon_resources": [(0, "windows/favicon.ico")]}
+          ]
+      ,name="Relational",
+               version="0.11"
+      )