gbrainy r458 - in trunk/platforms: . win32/installer win32/src

[jmas svn gnome org]

Author: jmas
Date: Sun Aug 31 19:12:54 2008
New Revision: 458
URL: http://svn.gnome.org/viewvc/gbrainy?rev=458&view=rev

Log:
2008-08-31 Jordi Mas <jmas softcatala org>

        * win32/*: Updated for gbrainy 1.00



Modified:
   trunk/platforms/ChangeLog
   trunk/platforms/win32/installer/gbrainy.nsi
   trunk/platforms/win32/src/Defines.cs
   trunk/platforms/win32/src/build.bat

Modified: trunk/platforms/win32/installer/gbrainy.nsi
==============================================================================
--- trunk/platforms/win32/installer/gbrainy.nsi	(original)
+++ trunk/platforms/win32/installer/gbrainy.nsi	Sun Aug 31 19:12:54 2008
@@ -2,13 +2,15 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "gbrainy"
-!define PRODUCT_VERSION "0.61"
+!define PRODUCT_VERSION "1.00"
 !define PRODUCT_WEB_SITE "http://live.gnome.org/gbrainy";
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\gbrainy.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
+SetCompress force 
+SetCompressor /solid lzma                   
+                                
 
-; Script generated by the HM NIS Edit Script Wizard.
 !include WordFunc.nsh
 !include LogicLib.nsh
 
@@ -50,6 +52,8 @@
 !insertmacro MUI_LANGUAGE "German"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "Slovak"
+!insertmacro MUI_LANGUAGE "Dutch"
 
 ; MUI end ------
 
@@ -72,10 +76,7 @@
   
   SetOverwrite ifnewer
   
-  SetOutPath "$INSTDIR"
-  File "..\topack\mono-1.2.1-gtksharp-2.8.3-win32-exp-0.0.exe"
-  ExecWait "$INSTDIR\mono-1.2.1-gtksharp-2.8.3-win32-exp-0.0.exe /silent"
-  Delete "$INSTDIR\mono-1.2.1-gtksharp-2.8.3-win32-exp-0.0.exe" 
+  SetOutPath "$INSTDIR"  
   
   SetOutPath "$INSTDIR\locale\ca\LC_MESSAGES\"
   File "/oname=gbrainy.mo" "..\topack\locale\ca.gmo" 
@@ -86,21 +87,35 @@
   SetOutPath "$INSTDIR\locale\de\LC_MESSAGES\"
   File "/oname=gbrainy.mo" "..\topack\locale\de.gmo"
   
-  SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES\"
-  File "/oname=gbrainy.mo" "..\topack\locale\fr.gmo"
+;  SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES\"
+;  File "/oname=gbrainy.mo" "..\topack\locale\fr.gmo"
   
-  SetOutPath "$INSTDIR\locale\nl\LC_MESSAGES\"
-  File "/oname=gbrainy.mo" "..\topack\locale\nl.gmo"
+;  SetOutPath "$INSTDIR\locale\nl\LC_MESSAGES\"
+;  File "/oname=gbrainy.mo" "..\topack\locale\nl.gmo"
+
+  SetOutPath "$INSTDIR\locale\it\LC_MESSAGES\"      
+  File "/oname=gbrainy.mo" "..\topack\locale\it.gmo"  
   
   SetOutPath "$INSTDIR\locale\gl\LC_MESSAGES\"
   File "/oname=gbrainy.mo" "..\topack\locale\gl.gmo"
   
+  SetOutPath "$INSTDIR\locale\sk\LC_MESSAGES\"
+  File "/oname=gbrainy.mo" "..\topack\locale\sk.gmo"
+  
+  SetOutPath "$INSTDIR\locale\nl\LC_MESSAGES\"
+  File "/oname=gbrainy.mo" "..\topack\locale\nl.gmo"
+  
+  SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES\"
+  File "/oname=gbrainy.mo" "..\topack\locale\fr.gmo"
+  
   SetOutPath "$INSTDIR"
   File "..\topack\gbrainy.exe"
-  File "..\topack\logic-games-80.png"
-  File "..\topack\memory-games-80.png"
-  File "..\topack\math-games-80.png"
+  File "..\topack\logic-games.svg"
+  File "..\topack\memory-games.svg"
+  File "..\topack\math-games.svg"
+  File "..\topack\background.svg"
   File "..\topack\gbrainy.bat"
+  File "/r" "..\topack\mono\*"
   
   
   CreateDirectory "$SMPROGRAMS\gbrainy"
@@ -138,18 +153,26 @@
   Abort
 FunctionEnd
 
-Section Uninstall
-  Delete "$INSTDIR\${PRODUCT_NAME}.url"
-  Delete "$INSTDIR\uninst.exe"
-  Delete "$INSTDIR\gbrainy.exe"
+Section Uninstall  
+  
+  Delete "$SMPROGRAMS\gbrainy\gbrainy.lnk"
+  Delete "$DESKTOP\gbrainy.lnk"
 
   Delete "$SMPROGRAMS\gbrainy\Uninstall.lnk"
   Delete "$SMPROGRAMS\gbrainy\Website.lnk"
   Delete "$DESKTOP\gbrainy.lnk"
   Delete "$SMPROGRAMS\gbrainy\gbrainy.lnk"
-
-  RMDir "$SMPROGRAMS\gbrainy"
-  RMDir "$INSTDIR"
+  RMDir /r "$INSTDIR\locale\*"
+  RMDir /r "$INSTDIR\mono\*"
+  Delete "$INSTDIR\gbrainy.bat"
+  Delete "$INSTDIR\gbrainy.exe"
+  Delete "$INSTDIR\logic-games.svg"
+  Delete "$INSTDIR\memory-games.svg"
+  Delete "$INSTDIR\math-games.svg"
+  Delete "$INSTDIR\background.svg"  
+  Delete "$INSTDIR\${PRODUCT_NAME}.url"
+  Delete "$INSTDIR\uninst.exe"
+  
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"

Modified: trunk/platforms/win32/src/Defines.cs
==============================================================================
--- trunk/platforms/win32/src/Defines.cs	(original)
+++ trunk/platforms/win32/src/Defines.cs	Sun Aug 31 19:12:54 2008
@@ -22,7 +22,7 @@
 
 public class Defines
 {
-	public static string VERSION = "0.70";
+	public static string VERSION = "1.00";
 	public const string GNOME_LOCALE_DIR = "locale/";
 	public static string DATA_DIR = "";
 }

Modified: trunk/platforms/win32/src/build.bat
==============================================================================
--- trunk/platforms/win32/src/build.bat	(original)
+++ trunk/platforms/win32/src/build.bat	Sun Aug 31 19:12:54 2008
@@ -1,5 +1,5 @@
-copy ..\data\*80*.png .
-gmcs -target:winexe -out:gbrainy.exe -nowarn:0169 PuzzleFourSided.cs Preferences.cs GtkDialog.cs PlayerHistory.cs PlayerHistoryDialog.cs PuzzleSquaresAndLetters.cs PuzzleTrianglesWithNumbers.cs CalculationFractions.cs PuzzleCountCircles.cs PuzzleEquation.cs PuzzleQuadrilaterals.cs PuzzleCountSeries.cs PuzzleExtraCircle.cs  ArrayListIndicesRandom.cs GameManager.cs PuzzleCirclesRectangle.cs Game.cs PuzzleFigures.cs PuzzleMatrixNumbers.cs PuzzleMoveFigure.cs PuzzlePencil.cs PuzzleSquares.cs PuzzleTriangles.cs PuzzleCoverPercentage.cs PuzzleNumericSequence.cs PuzzleSquareDots.cs PuzzleNumericRelation.cs PuzzleNextFigure.cs PuzzleSquareSheets.cs CalculationArithmetical.cs MemoryColouredFigures.cs GameSession.cs MemoryNumbers.cs Memory.cs MemoryColouredText.cs PuzzleCube.cs MemoryWords.cs PuzzleFigureLetter.cs CustomGameDialog.cs PuzzleDivideCircle.cs CalculationGreatestDivisor.cs CalculationTwoNumbers.cs CalculationWhichNumber.cs PuzzleMatrixGroups.cs PuzzleBalance.cs PuzzleOstra
 cism.cs MemoryCountDots.cs CalculationOperator.cs PuzzleFigurePattern.cs ColorPalette.cs PuzzlePeopleTable.cs GameDrawingArea.cs MemoryFigures.cs PuzzleMissingSlice.cs PuzzleLines.cs PuzzleTetris.cs PreferencesDialog.cs PuzzleMissingPiece.cs MemoryIndications.cs PuzzleMostInCommon.cs PuzzleBuildTriangle.cs CairoContextEx.cs PuzzleClocks.cs gbrainy.cs Defines.cs -pkg:gnome-sharp-2.0 -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -r:Mono.Cairo.dll -r:Mono.Posix -resource:gbrainy.glade -resource:../data/resume-32.png -resource:../data/endgame-32.png -resource:../data/pause-32.png -resource:../data/allgames-32.png -resource:../data/gbrainy.png -resource:../data/logic-games-32.png -resource:../data/math-games-32.png -resource:../data/memory-games-32.png -resource:../data/gbrainy.svg
-
-
-
+copy ..\data\*.svg .
+gmcs -target:winexe -out:gbrainy.exe SVGImage.cs PuzzleGames/PuzzleFourSided.cs Preferences.cs GtkDialog.cs PlayerHistory.cs PlayerHistoryDialog.cs PuzzleGames/PuzzleSquaresAndLetters.cs PuzzleGames/PuzzleTrianglesWithNumbers.cs CalculationGames/CalculationFractions.cs PuzzleGames/PuzzleCountCircles.cs PuzzleGames/PuzzleEquation.cs PuzzleGames/PuzzleQuadrilaterals.cs PuzzleGames/PuzzleCountSeries.cs PuzzleGames/PuzzleExtraCircle.cs  ArrayListIndicesRandom.cs GameManager.cs PuzzleGames/PuzzleCirclesRectangle.cs Game.cs PuzzleGames/PuzzleFigures.cs PuzzleGames/PuzzleMatrixNumbers.cs PuzzleGames/PuzzleMoveFigure.cs PuzzleGames/PuzzlePencil.cs PuzzleGames/PuzzleSquares.cs PuzzleGames/PuzzleTriangles.cs PuzzleGames/PuzzleCoverPercentage.cs PuzzleGames/PuzzleNumericSequence.cs PuzzleGames/PuzzleSquareDots.cs PuzzleGames/PuzzleNumericRelation.cs PuzzleGames/PuzzleNextFigure.cs PuzzleGames/PuzzleSquareSheets.cs CalculationGames/CalculationArithmetical.cs MemoryGames/MemoryColouredFi
 gures.cs GameSession.cs MemoryGames/MemoryNumbers.cs Memory.cs MemoryGames/MemoryColouredText.cs PuzzleGames/PuzzleCube.cs MemoryGames/MemoryWords.cs PuzzleGames/PuzzleFigureLetter.cs CustomGameDialog.cs PuzzleGames/PuzzleDivideCircle.cs CalculationGames/CalculationGreatestDivisor.cs CalculationGames/CalculationTwoNumbers.cs CalculationGames/CalculationWhichNumber.cs PuzzleGames/PuzzleMatrixGroups.cs PuzzleGames/PuzzleBalance.cs PuzzleGames/PuzzleOstracism.cs MemoryGames/MemoryCountDots.cs CalculationGames/CalculationOperator.cs PuzzleGames/PuzzleFigurePattern.cs ColorPalette.cs PuzzleGames/PuzzlePeopleTable.cs GameDrawingArea.cs MemoryGames/MemoryFigures.cs PuzzleGames/PuzzleMissingSlice.cs PuzzleGames/PuzzleLines.cs PuzzleGames/PuzzleTetris.cs PreferencesDialog.cs PuzzleGames/PuzzleMissingPiece.cs MemoryGames/MemoryIndications.cs PuzzleGames/PuzzleMostInCommon.cs PuzzleGames/PuzzleBuildTriangle.cs CairoContextEx.cs PuzzleGames/PuzzleClocks.cs PuzzleGames/PuzzleLargerShape.
 cs MemoryGames/MemoryFiguresNumbers.cs gbrainy.cs Defines.cs -pkg:gnome-sharp-2.0 -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -r:Mono.Cairo.dll -r:Mono.Posix -resource:gbrainy.glade -resource:../data/resume-32.png -resource:../data/endgame-32.png -resource:../data/pause-32.png -resource:../data/allgames-32.png -resource:../data/gbrainy.png -resource:../data/logic-games-32.png -resource:../data/math-games-32.png -resource:../data/memory-games-32.png -resource:../data/gbrainy.svg
+
+
+