Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhugent
mhugent committed Jul 11, 2011
2 parents bff8e54 + 8e3aca4 commit db469be
Show file tree
Hide file tree
Showing 19 changed files with 1,886 additions and 1,160 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Expand Up @@ -12,7 +12,7 @@ debian/*.substvars
Makefile
*-stamp
api_doc
build
build*
ms-windows/Installer-Files/postinstall.bat
ms-windows/Installer-Files/preremove.bat
ms-windows/osgeo4w/packages/
Expand All @@ -37,3 +37,5 @@ scripts/astyle.exe
doc/CODING.html
doc/CODING.tex
doc/INSTALL.tex
scripts/Debug
scripts/RelWithDebInfo
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Expand Up @@ -76,9 +76,10 @@ IF (WITH_BINDINGS)
SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
ENDIF (WITH_BINDINGS)

SET (WITH_GLOBE TRUE CACHE BOOL "Determines whether Globe plugin should be built")
SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
IF (WITH_GLOBE)
FIND_PACKAGE(OSGEARTH)
SET(QT_USE_QTOPENGL 1)
FIND_PACKAGE(OSGEARTH REQUIRED)
ENDIF (WITH_GLOBE)

# Compile flag. Make it possible to turn it off.
Expand Down
8 changes: 5 additions & 3 deletions cmake/FindOSGEARTH.cmake
View file
Expand Up @@ -26,6 +26,7 @@ FIND_PATH( ${THIS_OSGEARTH_INCLUDE_DIR} ${THIS_OSGEARTH_INCLUDE_FILE}
$ENV{OSGEARTH_SOURCE_DIR}
$ENV{OSGEARTHDIR}
$ENV{OSGEARTH_DIR}
$ENV{OSGEO4W_ROOT}
/usr/local/
/usr/
/sw/ # Fink
Expand Down Expand Up @@ -57,6 +58,7 @@ FIND_LIBRARY(${MYLIBRARY}
$ENV{OSGEARTH_DIR}
$ENV{OSGEARTHDIR}
$ENV{OSGEARTH_ROOT}
$ENV{OSGEO4W_ROOT}
~/Library/Frameworks
/Library/Frameworks
/usr/local
Expand All @@ -79,13 +81,13 @@ FIND_LIBRARY(${MYLIBRARY}
ENDMACRO(FIND_OSGEARTH_LIBRARY LIBRARY LIBRARYNAME)

FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY osgEarth )
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd)
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd )

FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY osgEarthUtil )
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild)
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild )

FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY osgEarthFeatures )
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd)
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )

FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )
Expand Down
1,945 changes: 928 additions & 1,017 deletions i18n/qgis_de.ts
View file

Large diffs are not rendered by default.

217 changes: 217 additions & 0 deletions mac/app.info.plist.in
View file
@@ -0,0 +1,217 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleName</key>
<string>QGIS</string>
<key>CFBundleIdentifier</key>
<string>org.qgis.qgis</string>
<key>CFBundleExecutable</key>
<string>${QGIS_APP_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>QGIS</string>
<key>CFBundleGetInfoString</key>
<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2011 QGIS Development Team</string>
<key>CFBundleShortVersionString</key>
<string>${COMPLETE_VERSION}</string>
<key>CFBundleVersion</key>
<string>${COMPLETE_VERSION} (${REVISION})</string>
<key>CFBundleIconFile</key>
<string>qgis.icns</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeName</key>
<string>QGIS Project document</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleTypeIconFile</key>
<string>qgs.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>qgs</string>
</array>
<key>CFBundleTypeOSTypes</key>
<array>
<string>QGIS</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>ESRI Shape document</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleTypeIconFile</key>
<string>shp.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>shp</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>SDTS document</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>ddf.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>ddf</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>MapInfo document</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>mif.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>mif</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>GML document</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>gml.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>gml</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>GeoTIFF image</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>tiff.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>tiff</string>
<string>tif</string>
</array>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>image/tiff</string>
</array>
<key>CFBundleTypeOSTypes</key>
<array>
<string>TIFF</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>ERDAS IMAGINE document</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>img.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>img</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>Arc/Info ASCII Grid document</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>asc.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>asc</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>DTED document</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>dt0.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>dt0</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>JPEG 2000 image</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>jp2.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>jp2</string>
</array>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>image/jp2</string>
</array>
<key>CFBundleTypeOSTypes</key>
<array>
<string>jp2 </string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>DEM document</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleTypeIconFile</key>
<string>dem.icns</string>
<key>CFBundleTypeExtensions</key>
<array>
<string>dem</string>
</array>
</dict>
</array>
<key>CFBundleLocalizations</key>
<array>
<string>en</string>
<string>ar</string>
<string>cs_CZ</string>
<string>de</string>
<string>el_GR</string>
<string>es</string>
<string>fr</string>
<string>hu</string>
<string>id</string>
<string>it</string>
<string>ja</string>
<string>lo</string>
<string>lt</string>
<string>lv</string>
<string>ka</string>
<string>mn</string>
<string>nl</string>
<string>pl_PL</string>
<string>pt_BR</string>
<string>ro</string>
<string>ru</string>
<string>sk</string>
<string>sq_AL</string>
<string>sv</string>
<string>th</string>
<string>tr</string>
<string>vi</string>
<string>zh_CN</string>
</array>
</dict>
</plist>
26 changes: 26 additions & 0 deletions mac/framework.info.plist.in
View file
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${MACOSX_FRAMEWORK_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_FRAMEWORK_NAME} ${COMPLETE_VERSION}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_FRAMEWORK_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${MACOSX_FRAMEWORK_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_FRAMEWORK_SHORT_VERSION_STRING}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${MACOSX_FRAMEWORK_NAME} ${COMPLETE_VERSION}</string>
</dict>
</plist>
8 changes: 8 additions & 0 deletions ms-windows/osgeo4w/package.cmd
View file
Expand Up @@ -89,6 +89,7 @@ cmake -G "Visual Studio 9 2008" ^
-D PEDANTIC=TRUE ^
-D WITH_SPATIALITE=TRUE ^
-D WITH_MAPSERVER=TRUE ^
-D WITH_GLOBE=TRUE ^
-D WITH_INTERNAL_SPATIALITE=TRUE ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
Expand Down Expand Up @@ -157,6 +158,7 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
--exclude "apps/%PACKAGENAME%/plugins/grassrasterprovider.dll" ^
--exclude "apps/%PACKAGENAME%/plugins/grassplugin.dll" ^
--exclude "apps/%PACKAGENAME%/plugins/grassprovider.dll" ^
--exclude "apps/%PACKAGENAME%/plugins/globeplugin.dll" ^
apps/%PACKAGENAME% ^
bin/%PACKAGENAME%.bat.tmpl ^
bin/%PACKAGENAME%-browser.bat.tmpl ^
Expand All @@ -179,6 +181,12 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz
>>%LOG% 2>&1
if errorlevel 1 goto error

tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
"apps/%PACKAGENAME%/globe" ^
"apps/%PACKAGENAME%/plugins/globeplugin.dll" ^
>>%LOG% 2>&1
if errorlevel 1 goto error

goto end

:error
Expand Down

0 comments on commit db469be

Please sign in to comment.