Skip to content

Commit 68ec365

Browse files
author
kyngchaos
committed
GRASS qgc update (r10930); optimize GRASS module install
git-svn-id: http://svn.osgeo.org/qgis/trunk@10938 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 03debe3 commit 68ec365

File tree

1 file changed

+8
-30
lines changed

1 file changed

+8
-30
lines changed

‎mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,6 @@
14211421
72E707260F426AFB00142011 /* resources_rc.py in Copy - plugininstall */ = {isa = PBXBuildFile; fileRef = 7209EDF50F39E5D9003DC336 /* resources_rc.py */; };
14221422
72E707270F426AFB00142011 /* unzip.py in Copy - plugininstall */ = {isa = PBXBuildFile; fileRef = 7209EDF60F39E5D9003DC336 /* unzip.py */; };
14231423
72E707280F426AFB00142011 /* version_compare.py in Copy - plugininstall */ = {isa = PBXBuildFile; fileRef = 7209EDF70F39E5D9003DC336 /* version_compare.py */; };
1424-
72E707320F426BEF00142011 /* default.qgc in Copy - config */ = {isa = PBXBuildFile; fileRef = 7209E8330F39E57B003DC336 /* default.qgc */; };
14251424
72E707350F426C6900142011 /* locations.gml in Copy - grass */ = {isa = PBXBuildFile; fileRef = 7209E8360F39E57B003DC336 /* locations.gml */; };
14261425
72E707360F426C6900142011 /* world.png in Copy - grass */ = {isa = PBXBuildFile; fileRef = 7209E8350F39E57B003DC336 /* world.png */; };
14271426
72E70A220F426D1C00142011 /* grass_add_map.png in Copy - theme-classic */ = {isa = PBXBuildFile; fileRef = 7209EB4E0F39E57B003DC336 /* grass_add_map.png */; };
@@ -3716,17 +3715,6 @@
37163715
name = "Copy - plugininstall";
37173716
runOnlyForDeploymentPostprocessing = 0;
37183717
};
3719-
72E707310F426BD700142011 /* Copy - config */ = {
3720-
isa = PBXCopyFilesBuildPhase;
3721-
buildActionMask = 2147483647;
3722-
dstPath = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_DATA_SUBDIR)/grass/config";
3723-
dstSubfolderSpec = 0;
3724-
files = (
3725-
72E707320F426BEF00142011 /* default.qgc in Copy - config */,
3726-
);
3727-
name = "Copy - config";
3728-
runOnlyForDeploymentPostprocessing = 0;
3729-
};
37303718
72E70A1F0F426CB600142011 /* Copy - grass */ = {
37313719
isa = PBXCopyFilesBuildPhase;
37323720
buildActionMask = 2147483647;
@@ -4815,8 +4803,6 @@
48154803
7209E82B0F39E57B003DC336 /* tracks.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = tracks.gpx; path = ../../src/plugins/gps_importer/sample_data/tracks.gpx; sourceTree = SOURCE_ROOT; };
48164804
7209E82C0F39E57B003DC336 /* waypoints.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = waypoints.gpx; path = ../../src/plugins/gps_importer/sample_data/waypoints.gpx; sourceTree = SOURCE_ROOT; };
48174805
7209E82F0F39E57B003DC336 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/grass/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
4818-
7209E8320F39E57B003DC336 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/grass/config/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
4819-
7209E8330F39E57B003DC336 /* default.qgc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = default.qgc; path = ../../src/plugins/grass/config/default.qgc; sourceTree = SOURCE_ROOT; };
48204806
7209E8350F39E57B003DC336 /* world.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = world.png; path = ../../src/plugins/grass/images/world.png; sourceTree = SOURCE_ROOT; };
48214807
7209E8360F39E57B003DC336 /* locations.gml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = locations.gml; path = ../../src/plugins/grass/locations.gml; sourceTree = SOURCE_ROOT; };
48224808
7209EB230F39E57B003DC336 /* qgsgrass_plugin.qrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsgrass_plugin.qrc; path = ../../src/plugins/grass/qgsgrass_plugin.qrc; sourceTree = SOURCE_ROOT; };
@@ -7191,6 +7177,8 @@
71917177
72F22FB50FDAC1F4000E8CB0 /* qgsmaptoolnodetool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptoolnodetool.cpp; path = ../../src/app/qgsmaptoolnodetool.cpp; sourceTree = SOURCE_ROOT; };
71927178
72F22FB60FDAC1F4000E8CB0 /* qgsmaptoolnodetool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptoolnodetool.h; path = ../../src/app/qgsmaptoolnodetool.h; sourceTree = SOURCE_ROOT; };
71937179
72F22FB80FDAC236000E8CB0 /* mActionNodeTool.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionNodeTool.png; path = ../../images/themes/default/mActionNodeTool.png; sourceTree = SOURCE_ROOT; };
7180+
72F6FCDE0FE7D78F00D5B53B /* default.qgc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = default.qgc; path = "../../src/plugins/grass/modules-6.3/default.qgc"; sourceTree = SOURCE_ROOT; };
7181+
72F6FCDF0FE7D79C00D5B53B /* default.qgc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = default.qgc; path = "../../src/plugins/grass/modules-6.4/default.qgc"; sourceTree = SOURCE_ROOT; };
71947182
72F8D9350F89234600D10CE5 /* FindIconv.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FindIconv.cmake; path = ../../cmake/FindIconv.cmake; sourceTree = SOURCE_ROOT; };
71957183
72F8D9390F8924AE00D10CE5 /* qgstolerance.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgstolerance.sip; path = ../../python/core/qgstolerance.sip; sourceTree = SOURCE_ROOT; };
71967184
72F8D9420F8924F100D10CE5 /* qgstolerance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgstolerance.h; path = ../../src/core/qgstolerance.h; sourceTree = SOURCE_ROOT; };
@@ -8694,7 +8682,6 @@
86948682
7299397A0FE3037600244D1A /* modules-6.4 */,
86958683
7299398F0FE3037600244D1A /* modules-common */,
86968684
721E07040FABDCAB00558FF9 /* qtermwidget */,
8697-
7209E8300F39E57B003DC336 /* config */,
86988685
7209E8340F39E57B003DC336 /* images */,
86998686
723FD0650FBCB94600EFA55D /* scripts */,
87008687
7209EB490F39E57B003DC336 /* themes */,
@@ -8703,16 +8690,6 @@
87038690
path = ../../src/plugins/grass;
87048691
sourceTree = SOURCE_ROOT;
87058692
};
8706-
7209E8300F39E57B003DC336 /* config */ = {
8707-
isa = PBXGroup;
8708-
children = (
8709-
7209E8320F39E57B003DC336 /* CMakeLists.txt */,
8710-
7209E8330F39E57B003DC336 /* default.qgc */,
8711-
);
8712-
name = config;
8713-
path = ../../src/plugins/grass/config;
8714-
sourceTree = SOURCE_ROOT;
8715-
};
87168693
7209E8340F39E57B003DC336 /* images */ = {
87178694
isa = PBXGroup;
87188695
children = (
@@ -10666,6 +10643,7 @@
1066610643
isa = PBXGroup;
1066710644
children = (
1066810645
7299396A0FE3037600244D1A /* CMakeLists.txt */,
10646+
72F6FCDE0FE7D78F00D5B53B /* default.qgc */,
1066910647
7299396B0FE3037600244D1A /* r.surf.fractal.1.png */,
1067010648
7299396C0FE3037600244D1A /* r.surf.fractal.2.png */,
1067110649
7299396D0FE3037600244D1A /* r.surf.fractal.qgm */,
@@ -10690,6 +10668,7 @@
1069010668
isa = PBXGroup;
1069110669
children = (
1069210670
7299397B0FE3037600244D1A /* CMakeLists.txt */,
10671+
72F6FCDF0FE7D79C00D5B53B /* default.qgc */,
1069310672
7299397C0FE3037600244D1A /* r.external.1.png */,
1069410673
7299397D0FE3037600244D1A /* r.external.qgis.1.png */,
1069510674
7299397E0FE3037600244D1A /* r.external.qgis.qgm */,
@@ -12305,12 +12284,11 @@
1230512284
72A56B5A0F3C823800BA32A1 /* Sources */,
1230612285
72A56B5B0F3C823800BA32A1 /* Frameworks */,
1230712286
72E70A1F0F426CB600142011 /* Copy - grass */,
12308-
72E707310F426BD700142011 /* Copy - config */,
1230912287
72E70A4E0F426D3B00142011 /* Copy - theme-classic */,
1231012288
72E70A810F426DF300142011 /* Copy - theme-gis */,
1231112289
72EBC9800F49D7F60016BA3C /* Copy - theme-default */,
1231212290
723FD0700FBCBA3D00EFA55D /* Copy - scripts */,
12313-
72993C820FE303FA00244D1A /* Script - copy modules */,
12291+
72993C820FE303FA00244D1A /* Script - copy modules & config */,
1231412292
);
1231512293
buildRules = (
1231612294
729288440F71F4F0006D9489 /* PBXBuildRule */,
@@ -12868,19 +12846,19 @@
1286812846
shellScript = "cd ../../i18n\nTS=`ls *.ts`\nmkdir -p \"$CONFIGURATION_BUILD_DIR/Qgis.app/Contents/MacOS/$QGIS_DATA_SUBDIR/i18n\"\ncd \"$CONFIGURATION_BUILD_DIR/Qgis.app/Contents/MacOS/$QGIS_DATA_SUBDIR/i18n\"\nfor t in $TS\ndo\n\ttb=`echo $t | cut -d . -f 1`\n\tif [ ! -f $tb.qm ] || [ \"$PROJECT_DIR/../../i18n/$t\" -nt $tb.qm ] ; then\n\t\t$QTLREL -verbose \"$PROJECT_DIR/../../i18n/$t\" -qm $tb.qm\n\tfi\ndone\n\nexit 0";
1286912847
showEnvVarsInLog = 0;
1287012848
};
12871-
72993C820FE303FA00244D1A /* Script - copy modules */ = {
12849+
72993C820FE303FA00244D1A /* Script - copy modules & config */ = {
1287212850
isa = PBXShellScriptBuildPhase;
1287312851
buildActionMask = 2147483647;
1287412852
files = (
1287512853
);
1287612854
inputPaths = (
1287712855
);
12878-
name = "Script - copy modules";
12856+
name = "Script - copy modules & config";
1287912857
outputPaths = (
1288012858
);
1288112859
runOnlyForDeploymentPostprocessing = 0;
1288212860
shellPath = /bin/sh;
12883-
shellScript = "# copy modules with script for conditional stuff\n\nmkdir -p \"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/grass/modules\"\n\ncd ../../src/plugins/$TARGET_PLUGINDIR/modules-common\ncp -f *.png \\\n\t*.qgm \\\n\t*.svg \\\n\t\"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/grass/modules\"\n\nif [ -d ../modules-$GRASS_VERSION ] ; then\ncd ../modules-$GRASS_VERSION\ncp -f *.png \\\n\t*.qgm \\\n\t*.svg \\\n\t\"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/grass/modules\"\nfi\n";
12861+
shellScript = "# copy modules with script for conditional stuff\n\nMODDIR=\"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/grass/modules\"\nmkdir -p \"$MODDIR\"\nCONFDIR=\"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/grass/config\"\nmkdir -p \"$CONFDIR\"\n\ncd ../../src/plugins/$TARGET_PLUGINDIR/modules-common\nMODS=`ls *.png *.qgm *.svg`\nfor m in $MODS\ndo\n\tif [ ! -f \"$MODDIR/$m\" ] || [ $m -nt \"$MODDIR/$m\" ] ; then\n\t\techo \"cp -f $m \\\"$MODDIR\\\"\"\n\t\tcp -f $m \"$MODDIR\"\n\tfi\ndone\n\nif [ -d ../modules-$GRASS_VERSION ] ; then\n\tcd ../modules-$GRASS_VERSION\n\tMODS=`ls *.png *.qgm *.svg`\n\tfor m in $MODS\n\tdo\n\t\tif [ ! -f \"$MODDIR/$m\" ] || [ $m -nt \"$MODDIR/$m\" ] ; then\n\t\t\techo \"cp -f $m \\\"$MODDIR\\\"\"\n\t\t\tcp -f $m \"$MODDIR\"\n\t\tfi\n\tdone\n\tif [ ! -f \"$CONFDIR/default.qgc\" ] || [ default.qgc -nt \"$CONFDIR/default.qgc\" ] ; then\n\t\techo \"cp -f default.qgc \\\"$CONFDIR\\\"\"\n\t\tcp -f default.qgc \"$CONFDIR\"\n\tfi\n\nfi\n";
1288412862
showEnvVarsInLog = 0;
1288512863
};
1288612864
729BBF0E0F407818001BCB63 /* Script - ui */ = {

0 commit comments

Comments
 (0)