Updated infrastructure for Windows

CMakeLists.txt

@@ -386,7 +386,6 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebI
 ENDIF()
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/default_config.ini.cmake ${CMAKE_SOURCE_DIR}/data/default_config.ini @ONLY)
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/updates.json.cmake ${CMAKE_SOURCE_DIR}/data/updates.json @ONLY)
 
 ########### uninstall files ###############
 CONFIGURE_FILE(

data/CMakeLists.txt

@@ -5,27 +5,32 @@ INSTALL(FILES stellarium.ico ssystem.ini ssystem_1000comets.ini base_locations.b
 # install Scenery3d shaders
 INSTALL(DIRECTORY shaders/ DESTINATION share/${PACKAGE}/data/shaders FILES_MATCHING 
 	PATTERN "s3d_*.vert" PATTERN "s3d_*.geom" PATTERN "s3d_*.frag")
+
+# install Scenery3D docs for Windows
+IF(WIN32)
+	INSTALL(FILES ../plugins/Scenery3d/doc/Scenery3d.pdf DESTINATION share/${PACKAGE}/data)
+ENDIF(WIN32)
 
 IF (BUILD_FOR_MAEMO)
-  INSTALL(FILES maemo/stellarium.desktop DESTINATION /usr/share/applications/hildon)
-  INSTALL(FILES maemo/stellarium.png DESTINATION /usr/share/icons/hicolor/48x48/apps)
+	INSTALL(FILES maemo/stellarium.desktop DESTINATION /usr/share/applications/hildon)
+	INSTALL(FILES maemo/stellarium.png DESTINATION /usr/share/icons/hicolor/48x48/apps)
 ENDIF()
 
 IF(UNIX AND NOT APPLE)
-  INSTALL(FILES stellarium.desktop DESTINATION share/applications)
-  INSTALL(FILES stellarium.xpm DESTINATION share/pixmaps)
-  INSTALL(FILES stellarium.appdata.xml DESTINATION share/appdata)
-  INSTALL(FILES icons/16x16/stellarium.png DESTINATION share/icons/hicolor/16x16/apps)
-  INSTALL(FILES icons/32x32/stellarium.png DESTINATION share/icons/hicolor/32x32/apps)
-  INSTALL(FILES icons/48x48/stellarium.png DESTINATION share/icons/hicolor/48x48/apps)
-  INSTALL(FILES icons/64x64/stellarium.png DESTINATION share/icons/hicolor/64x64/apps)
-  INSTALL(FILES icons/128x128/stellarium.png DESTINATION share/icons/hicolor/128x128/apps)
-  INSTALL(FILES icons/256x256/stellarium.png DESTINATION share/icons/hicolor/256x256/apps)
-  INSTALL(FILES icons/512x512/stellarium.png DESTINATION share/icons/hicolor/512x512/apps)
+	INSTALL(FILES stellarium.desktop DESTINATION share/applications)
+	INSTALL(FILES stellarium.xpm DESTINATION share/pixmaps)
+	INSTALL(FILES stellarium.appdata.xml DESTINATION share/appdata)
+	INSTALL(FILES icons/16x16/stellarium.png DESTINATION share/icons/hicolor/16x16/apps)
+	INSTALL(FILES icons/32x32/stellarium.png DESTINATION share/icons/hicolor/32x32/apps)
+	INSTALL(FILES icons/48x48/stellarium.png DESTINATION share/icons/hicolor/48x48/apps)
+	INSTALL(FILES icons/64x64/stellarium.png DESTINATION share/icons/hicolor/64x64/apps)
+	INSTALL(FILES icons/128x128/stellarium.png DESTINATION share/icons/hicolor/128x128/apps)
+	INSTALL(FILES icons/256x256/stellarium.png DESTINATION share/icons/hicolor/256x256/apps)
+	INSTALL(FILES icons/512x512/stellarium.png DESTINATION share/icons/hicolor/512x512/apps)
 ENDIF()
 
 IF(MACOSX)
-  INSTALL(FILES Icon.icns DESTINATION share )
-  INSTALL(FILES Info.plist PkgInfo DESTINATION . )
+	INSTALL(FILES Icon.icns DESTINATION share )
+	INSTALL(FILES Info.plist PkgInfo DESTINATION . )
 ENDIF(MACOSX)
 

doc/scripting.doxygen

@@ -58,7 +58,7 @@ core.wait(...);
    - GridLinesMgr
    - LabelMgr
    - LandscapeMgr
-   - MeteorMgr
+   - SporadicMeteorMgr
    - NebulaMgr
    - ScreenImageMgr
    - SolarSystem

stellarium-devdocs.url

@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=http://www.stellarium.org/doc/

stellarium-guide.url

@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=http://www.stellarium.org/wiki/index.php/Stellarium_User_Guide

stellarium.iss.cmake

@@ -30,6 +30,8 @@ Source: "@CMAKE_INSTALL_PREFIX@\bin\stellarium.exe"; DestDir: "{app}"
 @MESALIB@
 @REDIST_FILES@
 Source: "stellarium.url"; DestDir: "{app}"
+Source: "stellarium-guide.url"; DestDir: "{app}"
+Source: "stellarium-devdocs.url"; DestDir: "{app}"
 Source: "README"; DestDir: "{app}"; Flags: isreadme; DestName: "README.rtf"
 Source: "INSTALL"; DestDir: "{app}"; DestName: "INSTALL.rtf"
 Source: "COPYING"; DestDir: "{app}"; DestName: "GPL.rtf"
@@ -86,6 +88,8 @@ Type: filesandordirs; Name: "{localappdata}\stellarium\stellarium"; Tasks: remov
 
 [Icons]
 Name: "{group}\{cm:ProgramOnTheWeb,Stellarium}"; Filename: "{app}\stellarium.url"; IconFilename: "{app}\data\stellarium.ico"
+Name: "{group}\{cm:UserGuideOnTheWeb}"; Filename: "{app}\stellarium-guide.url"; IconFilename: "{app}\data\stellarium.ico"
+Name: "{group}\{cm:DevelopersDocsOnTheWeb}"; Filename: "{app}\stellarium-devdocs.url"; IconFilename: "{app}\data\stellarium.ico"
 Name: "{group}\Stellarium"; Filename: "{app}\stellarium.exe"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"
 ;Name: "{group}\Stellarium {cm:FallbackMode}"; Filename: "{app}\stellarium.exe"; Parameters: "--safe-mode"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"
 Name: "{group}\Stellarium {cm:DebugMode}"; Filename: "{app}\stellarium.exe"; Parameters: "--dump-opengl-details"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"
@@ -95,6 +99,7 @@ Name: "{group}\{cm:UninstallProgram,Stellarium}"; Filename: "{uninstallexe}"
 Name: "{group}\config.ini"; Filename: "{userappdata}\Stellarium\config.ini"
 Name: "{group}\{cm:LastRunLog}"; Filename: "{userappdata}\Stellarium\log.txt"
 Name: "{group}\{cm:ChangeLog}"; Filename: "{app}\ChangeLog.rtf"
+Name: "{group}\{cm:Scenery3dDocs}"; Filename: "{app}\Scenery3d.pdf"
 Name: "{commondesktop}\Stellarium"; Filename: "{app}\stellarium.exe"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"; Tasks: desktopicon\common
 Name: "{userdesktop}\Stellarium"; Filename: "{app}\stellarium.exe"; WorkingDir: "{app}"; IconFilename: "{app}\data\stellarium.ico"; Tasks: desktopicon\user
 

util/ISL/EnglishCM.isl

@@ -20,6 +20,9 @@ RemoveSolarConfig=Remove Solar System file
 RemoveUILandscapes=Remove user-installed landscapes
 RemoveShortcutsConfig=Remove shortcuts' configuration file
 RemoveCache=Remove cache files
+UserGuideOnTheWeb=Stellarium User Guide on the web
+DevelopersDocsOnTheWeb=Stellarium Developers Documentation on the web
+Scenery3dDocs=Scenery3D - Walkable 3D Models in Stellarium
 LastRunLog=Last run log
 ChangeLog=Change log
 FallbackMode=(fallback mode)