Skip to content

Commit d74d13e

Browse files
author
kyngchaos
committedDec 27, 2009
sync with help app fix (r12622)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12626 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 732ff05 commit d74d13e

File tree

1 file changed

+158
-21
lines changed

1 file changed

+158
-21
lines changed
 

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

Lines changed: 158 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
dependencies = (
5656
727E6B520FEABF4E00DF6F64 /* PBXTargetDependency */,
5757
7256F1CD0F411CDD0022BE1F /* PBXTargetDependency */,
58-
7256F1CF0F411CF70022BE1F /* PBXTargetDependency */,
58+
7249EBF310E7C0E200708435 /* PBXTargetDependency */,
5959
72E706FA0F42613A00142011 /* PBXTargetDependency */,
6060
7256F1D10F411D080022BE1F /* PBXTargetDependency */,
6161
);
@@ -635,6 +635,12 @@
635635
723FD05F0FBCB87900EFA55D /* qgspalgeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 723FD05D0FBCB85D00EFA55D /* qgspalgeometry.cpp */; };
636636
72442AEB1095DD4C00B54796 /* qgsavoidintersectionsdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */; };
637637
72442AEC1095DD4C00B54796 /* qgsavoidintersectionsdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */; };
638+
7249EBDC10E7BCDA00708435 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E7790F39E57A003DC336 /* main.cpp */; };
639+
7249EBDD10E7BCDA00708435 /* qgshelpserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77A0F39E57A003DC336 /* qgshelpserver.cpp */; };
640+
7249EBDE10E7BCDA00708435 /* qgshelpserver.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77B0F39E57A003DC336 /* qgshelpserver.h */; };
641+
7249EBDF10E7BCDA00708435 /* qgshelpviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77C0F39E57A003DC336 /* qgshelpviewer.cpp */; };
642+
7249EBE010E7BCDA00708435 /* qgshelpviewer.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E77D0F39E57A003DC336 /* qgshelpviewer.h */; };
643+
7249EBE410E7BF5000708435 /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
638644
724D05C610A910F200F9680A /* north-arrow_10_with_map_layers.svg in Copy - svg-n_arrow */ = {isa = PBXBuildFile; fileRef = 724D05BE10A910B400F9680A /* north-arrow_10_with_map_layers.svg */; };
639645
724D05C710A910F200F9680A /* north-arrow_11_simple_corner.svg in Copy - svg-n_arrow */ = {isa = PBXBuildFile; fileRef = 724D05BF10A910B400F9680A /* north-arrow_11_simple_corner.svg */; };
640646
724D05C810A910F200F9680A /* north-arrow_12_triangular_arrows_with_worldmap.svg in Copy - svg-n_arrow */ = {isa = PBXBuildFile; fileRef = 724D05C010A910B400F9680A /* north-arrow_12_triangular_arrows_with_worldmap.svg */; };
@@ -1586,6 +1592,17 @@
15861592
);
15871593
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
15881594
};
1595+
7249EBE310E7BDBA00708435 /* PBXBuildRule */ = {
1596+
isa = PBXBuildRule;
1597+
compilerSpec = com.apple.compilers.proxy.script;
1598+
filePatterns = "*.h";
1599+
fileType = pattern.proxy;
1600+
isEditable = 1;
1601+
outputFiles = (
1602+
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
1603+
);
1604+
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1605+
};
15891606
7262ED980F7A770300498385 /* PBXBuildRule */ = {
15901607
isa = PBXBuildRule;
15911608
compilerSpec = com.apple.compilers.proxy.script;
@@ -2168,6 +2185,13 @@
21682185
remoteGlobalIDString = 7225EF1710B2265A00D23EA2;
21692186
remoteInfo = labelingplugin;
21702187
};
2188+
7249EBF210E7C0E200708435 /* PBXContainerItemProxy */ = {
2189+
isa = PBXContainerItemProxy;
2190+
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
2191+
proxyType = 1;
2192+
remoteGlobalIDString = 7249EBD610E7BBEA00708435 /* qgis_help */;
2193+
remoteInfo = qgis_help;
2194+
};
21712195
7256F18F0F411B110022BE1F /* PBXContainerItemProxy */ = {
21722196
isa = PBXContainerItemProxy;
21732197
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -2343,13 +2367,6 @@
23432367
remoteGlobalIDString = 729BBE720F4075D1001BCB63;
23442368
remoteInfo = "All Plugins";
23452369
};
2346-
7256F1CE0F411CF70022BE1F /* PBXContainerItemProxy */ = {
2347-
isa = PBXContainerItemProxy;
2348-
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
2349-
proxyType = 1;
2350-
remoteGlobalIDString = 729BBEFE0F40770B001BCB63;
2351-
remoteInfo = ggis_help;
2352-
};
23532370
7256F1D00F411D080022BE1F /* PBXContainerItemProxy */ = {
23542371
isa = PBXContainerItemProxy;
23552372
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -5162,6 +5179,7 @@
51625179
72442AE81095DCD800B54796 /* qgsavoidintersectionsdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsavoidintersectionsdialogbase.ui; path = ../../src/ui/qgsavoidintersectionsdialogbase.ui; sourceTree = SOURCE_ROOT; };
51635180
72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsavoidintersectionsdialog.cpp; path = ../../src/app/qgsavoidintersectionsdialog.cpp; sourceTree = SOURCE_ROOT; };
51645181
72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsavoidintersectionsdialog.h; path = ../../src/app/qgsavoidintersectionsdialog.h; sourceTree = SOURCE_ROOT; };
5182+
7249EBD710E7BBEA00708435 /* qgis_help */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = qgis_help; sourceTree = BUILT_PRODUCTS_DIR; };
51655183
724C9FE11019EDE700A1E1D4 /* mActionSaveAsPDF.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSaveAsPDF.png; path = ../../images/themes/default/mActionSaveAsPDF.png; sourceTree = SOURCE_ROOT; };
51665184
724C9FEC1019EE2500A1E1D4 /* mActionSaveAsPDF.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSaveAsPDF.png; path = ../../images/themes/gis/mActionSaveAsPDF.png; sourceTree = SOURCE_ROOT; };
51675185
724D05B510A910B400F9680A /* north-arrow_1_simple_half_arrow.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = "north-arrow_1_simple_half_arrow.svg"; path = "../../images/svg/north_arrows/north-arrow_1_simple_half_arrow.svg"; sourceTree = SOURCE_ROOT; };
@@ -6933,6 +6951,14 @@
69336951
);
69346952
runOnlyForDeploymentPostprocessing = 0;
69356953
};
6954+
7249EBD510E7BBEA00708435 /* Frameworks */ = {
6955+
isa = PBXFrameworksBuildPhase;
6956+
buildActionMask = 2147483647;
6957+
files = (
6958+
7249EBE410E7BF5000708435 /* libqgis_core.dylib in Frameworks */,
6959+
);
6960+
runOnlyForDeploymentPostprocessing = 0;
6961+
};
69366962
7262ED960F7A770300498385 /* Frameworks */ = {
69376963
isa = PBXFrameworksBuildPhase;
69386964
buildActionMask = 2147483647;
@@ -7257,6 +7283,7 @@
72577283
726C67411046030F00EFEDCC /* librasterterrainplugin.so */,
72587284
721598191052B46D003D1610 /* libqgis_analysis.dylib */,
72597285
7225EF2210B2265A00D23EA2 /* liblabelingplugin.so */,
7286+
7249EBD710E7BBEA00708435 /* qgis_help */,
72607287
);
72617288
name = Products;
72627289
sourceTree = "<group>";
@@ -12615,6 +12642,24 @@
1261512642
productReference = 7225EF2210B2265A00D23EA2 /* liblabelingplugin.so */;
1261612643
productType = "com.apple.product-type.tool";
1261712644
};
12645+
7249EBD610E7BBEA00708435 /* qgis_help */ = {
12646+
isa = PBXNativeTarget;
12647+
buildConfigurationList = 7249EBDB10E7BC1300708435 /* Build configuration list for PBXNativeTarget "qgis_help" */;
12648+
buildPhases = (
12649+
7249EBE210E7BCEC00708435 /* Script - ui */,
12650+
7249EBD410E7BBEA00708435 /* Sources */,
12651+
7249EBD510E7BBEA00708435 /* Frameworks */,
12652+
);
12653+
buildRules = (
12654+
7249EBE310E7BDBA00708435 /* PBXBuildRule */,
12655+
);
12656+
dependencies = (
12657+
);
12658+
name = qgis_help;
12659+
productName = qgis_help;
12660+
productReference = 7249EBD710E7BBEA00708435 /* qgis_help */;
12661+
productType = "com.apple.product-type.tool";
12662+
};
1261812663
7262ED920F7A770300498385 /* spatialiteprovider */ = {
1261912664
isa = PBXNativeTarget;
1262012665
buildConfigurationList = 7262ED990F7A770300498385 /* Build configuration list for PBXNativeTarget "spatialiteprovider" */;
@@ -12651,9 +12696,9 @@
1265112696
productReference = 726C67411046030F00EFEDCC /* librasterterrainplugin.so */;
1265212697
productType = "com.apple.product-type.tool";
1265312698
};
12654-
729BBEFE0F40770B001BCB63 /* qgis_help */ = {
12699+
729BBEFE0F40770B001BCB63 /* qgis_help app */ = {
1265512700
isa = PBXNativeTarget;
12656-
buildConfigurationList = 729BBF040F40770C001BCB63 /* Build configuration list for PBXNativeTarget "qgis_help" */;
12701+
buildConfigurationList = 729BBF040F40770C001BCB63 /* Build configuration list for PBXNativeTarget "qgis_help app" */;
1265712702
buildPhases = (
1265812703
729BBF0E0F407818001BCB63 /* Script - ui */,
1265912704
729BBEFB0F40770B001BCB63 /* Resources */,
@@ -12666,7 +12711,7 @@
1266612711
);
1266712712
dependencies = (
1266812713
);
12669-
name = qgis_help;
12714+
name = "qgis_help app";
1267012715
productName = ggis_help;
1267112716
productReference = 729BBEFF0F40770B001BCB63 /* qgis_help.app */;
1267212717
productType = "com.apple.product-type.application";
@@ -13246,7 +13291,8 @@
1324613291
721597EA1052B46D003D1610 /* qgis_analysis */,
1324713292
7209F3120F3A2F2B003DC336 /* qgis_gui */,
1324813293
8D0C4E890486CD37000505A6 /* Qgis */,
13249-
729BBEFE0F40770B001BCB63 /* qgis_help */,
13294+
729BBEFE0F40770B001BCB63 /* qgis_help app */,
13295+
7249EBD610E7BBEA00708435 /* qgis_help */,
1325013296
729BBF320F407CBA001BCB63 /* qgispython */,
1325113297
7256F1540F4105770022BE1F /* python_modules */,
1325213298
72A07DB90F3BDFC8004FC2A4 /* provider template */,
@@ -13392,6 +13438,21 @@
1339213438
shellScript = "GUI_UI=\"$TARGET_TEMP_DIR/../qgis_gui.build/DerivedSources\"\n\nfor u in qgsdetaileditemwidgetbase qgsgenericprojectionselectorbase qgsmessageviewer qgsprojectionselectorbase\ndo\n\tcp -f \"$GUI_UI/ui_$u.h\" \"$QGIS_BUILD_PATH/Headers/qgis/\"\ndone\n";
1339313439
showEnvVarsInLog = 0;
1339413440
};
13441+
7249EBE210E7BCEC00708435 /* Script - ui */ = {
13442+
isa = PBXShellScriptBuildPhase;
13443+
buildActionMask = 2147483647;
13444+
files = (
13445+
);
13446+
inputPaths = (
13447+
);
13448+
name = "Script - ui";
13449+
outputPaths = (
13450+
);
13451+
runOnlyForDeploymentPostprocessing = 0;
13452+
shellPath = /bin/sh;
13453+
shellScript = "# generate ui headers in separate script because:\n# 1. Xcode will attempt to process generated *.h with moc rule\n# 2. parallel processing might not finish ui's before a cpp source needs it\n\n# derived sources dir created by Compile Sources phase, we need it NOW\nmkdir -p \"$DERIVED_FILES_DIR\"\n\ncd ../../src/helpviewer\n\nUIUI=`ls *.ui`\n\nfor u in $UIUI\ndo\n\tuh=`echo $u | sed 's,\\.ui$,.h,'`\n\t# compare times because output files spec below doesn't seem to work with wildcards\n\tif [ ! -f \"$DERIVED_FILES_DIR/ui_$uh\" ] || [ $u -nt \"$DERIVED_FILES_DIR/ui_$uh\" ] ; then\n\t\trm -f \"$DERIVED_FILES_DIR/ui_$uh\"\n\t\techo \"$QTUIC -o \\\"$DERIVED_FILES_DIR/ui_$uh\\\" $u\"\n\t\t$QTUIC -o \"$DERIVED_FILES_DIR/ui_$uh\" $u\n\tfi\ndone\n\nexit 0\n";
13454+
showEnvVarsInLog = 0;
13455+
};
1339513456
7256F1530F4105770022BE1F /* configure.py */ = {
1339613457
isa = PBXShellScriptBuildPhase;
1339713458
buildActionMask = 2147483647;
@@ -13868,7 +13929,7 @@
1386813929
);
1386913930
runOnlyForDeploymentPostprocessing = 0;
1387013931
shellPath = /bin/sh;
13871-
shellScript = "# Note: assumes default Qt binary framework install\n\nAPPDIRC=\"$QGIS_BUILD_PATH\" # app contents\nAPPDIR=\"$APPDIRC/MacOS\"\nFWDIR=\"$APPDIR/$QGIS_FW_SUBDIR\"\nLIBDIR=\"$APPDIR/$QGIS_LIB_SUBDIR\"\nQGISPYDIR=\"$APPDIR/$QGIS_DATA_SUBDIR/python\"\n\n# qt arches\nQARCHS=\"\"\nfor a in $ARCHS\ndo\n\tQARCHS=\"$QARCHS -arch $a\"\ndone\n\n# copy Qt frameworks\nmkdir -p \"$FWDIR\"\nfor q in $QTLISTQG\ndo\n\tif [ ! -d \"$FWDIR/$q.framework\" ] ; then\n\t\t# reconstruct framework to avoid excessive copying, then deleting\n\t\t# especially when debug variants are present\n\t\tmkdir -p \"$FWDIR/$q.framework/Versions/$QT_FWVER\"\n\t\tln -sfh $QT_FWVER \"$FWDIR/$q.framework/Versions/Current\"\n\t\tditto $QARCHS \"/Library/Frameworks/$q.framework/$q\" \"$FWDIR/$q.framework/Versions/$QT_FWVER/$q\"\n\t\tln -sf Versions/Current/$q \"$FWDIR/$q.framework/$q\"\n\t\tif [ -d \"/Library/Frameworks/$q.framework/Versions/$QT_FWVER/Resources\" ] ; then\n\t\t\tcp -Rfp \"/Library/Frameworks/$q.framework/Versions/$QT_FWVER/Resources\" \"$FWDIR/$q.framework/Versions/$QT_FWVER\"\n\t\t\tln -sfh Versions/Current/Resources \"$FWDIR/$q.framework/Resources\"\n\t\tfi\n\t\t# debug variants\n\t\tqd=$q\"_debug\"\n\t\tif [ \"$CONFIGURATION\" = \"Debug\" ] && [ -f \"/Library/Frameworks/$q.framework/Versions/$QT_FWVER/$qd\" ] ; then\n\t\t\tditto $QARCHS \"/Library/Frameworks/$q.framework/Versions/$QT_FWVER/$qd\" \"$FWDIR/$q.framework/Versions/$QT_FWVER/$qd\"\n\t\t\tln -sf Versions/Current/$qd \"$FWDIR/$q.framework/$qd\"\n\t\t\tif [ -d \"/Library/Frameworks/$q.framework/$qd.dSYM\" ] ; then\n\t\t\t\tditto $QARCHS \"/Library/Frameworks/$q.framework/$qd.dSYM\" \"$FWDIR/$q.framework\"\n\t\t\tfi\n\t\tfi\n\tfi\ndone\n\n# copy Qt plugins\nmkdir -p \"$APPDIRC/PlugIns/imageformats\"\nif [ ! -f \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\" ] ; then\n\tditto $QARCHS \"$QT_PLUGINS_DIR/imageformats/libqjpeg.dylib\" \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\nfi\n\n# PyQt path based on PYTHON_FORM\n\nif [ \"$PYSITE\" ] ; then\n\tmkdir -p \"$QGISPYDIR/PyQt$QT_FWVER\"\n\tif [ ! -f \"$QGISPYDIR/sip.so\" ] ; then\n\t\tditto $QARCHS \"$PYSITE/sip.so\" \"$PYSITE/sipconfig.py\" \"$QGISPYDIR/\"\n\tfi\n\tfor q in $PYQTLIST\n\tdo\n\t\tif [ ! -f \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\" ] ; then\n\t\t\tditto $QARCHS \"$PYSITE/PyQt$QT_FWVER/$q.so\" \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\"\n\t\tfi\n\tdone\n\tcp -fp \"$PYSITE/PyQt$QT_FWVER/\"*.py \"$QGISPYDIR/PyQt$QT_FWVER/\"\nfi\n\n# just in case no plugins were compiled\nmkdir -p \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\n# list plugins & libs\ncd \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls`\ncd \"$APPDIR/$QGIS_LIB_SUBDIR\"\nqgliblist=`ls *.dylib`\nif [ \"$PYSITE\" ] ; then\n\tcd \"$QGISPYDIR/qgis\"\n\tqgpylist=`ls *.so`\nfi\n\n# main Qt framework loop\n\ncd \"$APPDIR\"\n\nfor q in $QTLISTQG\ndo\n\tqq=\"$q.framework/Versions/$QT_FWVER/$q\"\n\t# app\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/Qgis\"\n\t# bin\n\t# qgis_help qt linking done with symlinks\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_BIN_SUBDIR/qgis_help.app/Contents/MacOS/qgis_help\"\n\t# libs\n\tfor ql in $qgliblist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_LIB_SUBDIR/$ql\"\n\tdone\n\t# plugins\n\tfor qp in $pluglist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_PLUGIN_SUBDIR/$qp\"\n\tdone\n\t# qt fw\n\tfor qf in $QTLISTQG\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework/Versions/$QT_FWVER/$qf\"\n\tdone\n\t# qt plugs\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\n\t# PyQt\n\tif [ \"$PYSITE\" ] ; then\n\t\tfor pq in $PYQTLIST\n\t\tdo\n\t\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/PyQt$QT_FWVER/$pq.so\"\n\t\tdone\n\t\tfor pg in $qgpylist\n\t\tdo\n\t\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/$pg\"\n\t\tdone\n\tfi\ndone\n";
13932+
shellScript = "# Note: assumes default Qt binary framework install\n\nAPPDIRC=\"$QGIS_BUILD_PATH\" # app contents\nAPPDIR=\"$APPDIRC/MacOS\"\nFWDIR=\"$APPDIR/$QGIS_FW_SUBDIR\"\nLIBDIR=\"$APPDIR/$QGIS_LIB_SUBDIR\"\nQGISPYDIR=\"$APPDIR/$QGIS_DATA_SUBDIR/python\"\n\n# qt arches\nQARCHS=\"\"\nfor a in $ARCHS\ndo\n\tQARCHS=\"$QARCHS -arch $a\"\ndone\n\n# copy Qt frameworks\nmkdir -p \"$FWDIR\"\nfor q in $QTLISTQG\ndo\n\tif [ ! -d \"$FWDIR/$q.framework\" ] ; then\n\t\t# reconstruct framework to avoid excessive copying, then deleting\n\t\t# especially when debug variants are present\n\t\tmkdir -p \"$FWDIR/$q.framework/Versions/$QT_FWVER\"\n\t\tln -sfh $QT_FWVER \"$FWDIR/$q.framework/Versions/Current\"\n\t\tditto $QARCHS \"/Library/Frameworks/$q.framework/$q\" \"$FWDIR/$q.framework/Versions/$QT_FWVER/$q\"\n\t\tln -sf Versions/Current/$q \"$FWDIR/$q.framework/$q\"\n\t\tif [ -d \"/Library/Frameworks/$q.framework/Versions/$QT_FWVER/Resources\" ] ; then\n\t\t\tcp -Rfp \"/Library/Frameworks/$q.framework/Versions/$QT_FWVER/Resources\" \"$FWDIR/$q.framework/Versions/$QT_FWVER\"\n\t\t\tln -sfh Versions/Current/Resources \"$FWDIR/$q.framework/Resources\"\n\t\tfi\n\t\t# debug variants\n\t\tqd=$q\"_debug\"\n\t\tif [ \"$CONFIGURATION\" = \"Debug\" ] && [ -f \"/Library/Frameworks/$q.framework/Versions/$QT_FWVER/$qd\" ] ; then\n\t\t\tditto $QARCHS \"/Library/Frameworks/$q.framework/Versions/$QT_FWVER/$qd\" \"$FWDIR/$q.framework/Versions/$QT_FWVER/$qd\"\n\t\t\tln -sf Versions/Current/$qd \"$FWDIR/$q.framework/$qd\"\n\t\t\tif [ -d \"/Library/Frameworks/$q.framework/$qd.dSYM\" ] ; then\n\t\t\t\tditto $QARCHS \"/Library/Frameworks/$q.framework/$qd.dSYM\" \"$FWDIR/$q.framework\"\n\t\t\tfi\n\t\tfi\n\tfi\ndone\n\n# copy Qt plugins\nmkdir -p \"$APPDIRC/PlugIns/imageformats\"\nif [ ! -f \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\" ] ; then\n\tditto $QARCHS \"$QT_PLUGINS_DIR/imageformats/libqjpeg.dylib\" \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\nfi\n\n# PyQt path based on PYTHON_FORM\n\nif [ \"$PYSITE\" ] ; then\n\tmkdir -p \"$QGISPYDIR/PyQt$QT_FWVER\"\n\tif [ ! -f \"$QGISPYDIR/sip.so\" ] ; then\n\t\tditto $QARCHS \"$PYSITE/sip.so\" \"$PYSITE/sipconfig.py\" \"$QGISPYDIR/\"\n\tfi\n\tfor q in $PYQTLIST\n\tdo\n\t\tif [ ! -f \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\" ] ; then\n\t\t\tditto $QARCHS \"$PYSITE/PyQt$QT_FWVER/$q.so\" \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\"\n\t\tfi\n\tdone\n\tcp -fp \"$PYSITE/PyQt$QT_FWVER/\"*.py \"$QGISPYDIR/PyQt$QT_FWVER/\"\nfi\n\n# just in case no plugins were compiled\nmkdir -p \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\n# list plugins & libs\ncd \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls`\ncd \"$APPDIR/$QGIS_LIB_SUBDIR\"\nqgliblist=`ls *.dylib`\nif [ \"$PYSITE\" ] ; then\n\tcd \"$QGISPYDIR/qgis\"\n\tqgpylist=`ls *.so`\nfi\n\n# main Qt framework loop\n\ncd \"$APPDIR\"\n\nfor q in $QTLISTQG\ndo\n\tqq=\"$q.framework/Versions/$QT_FWVER/$q\"\n\t# app\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/Qgis\"\n\t# qgis_help\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/qgis_help\"\n\t# libs\n\tfor ql in $qgliblist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_LIB_SUBDIR/$ql\"\n\tdone\n\t# plugins\n\tfor qp in $pluglist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_PLUGIN_SUBDIR/$qp\"\n\tdone\n\t# qt fw\n\tfor qf in $QTLISTQG\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework/Versions/$QT_FWVER/$qf\"\n\tdone\n\t# qt plugs\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\n\t# PyQt\n\tif [ \"$PYSITE\" ] ; then\n\t\tfor pq in $PYQTLIST\n\t\tdo\n\t\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/PyQt$QT_FWVER/$pq.so\"\n\t\tdone\n\t\tfor pg in $qgpylist\n\t\tdo\n\t\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/$pg\"\n\t\tdone\n\tfi\ndone\n";
1387213933
showEnvVarsInLog = 0;
1387313934
};
1387413935
72FB0B4B0FFD680F0052360B /* Script - ui */ = {
@@ -14222,6 +14283,18 @@
1422214283
);
1422314284
runOnlyForDeploymentPostprocessing = 0;
1422414285
};
14286+
7249EBD410E7BBEA00708435 /* Sources */ = {
14287+
isa = PBXSourcesBuildPhase;
14288+
buildActionMask = 2147483647;
14289+
files = (
14290+
7249EBDC10E7BCDA00708435 /* main.cpp in Sources */,
14291+
7249EBDD10E7BCDA00708435 /* qgshelpserver.cpp in Sources */,
14292+
7249EBDE10E7BCDA00708435 /* qgshelpserver.h in Sources */,
14293+
7249EBDF10E7BCDA00708435 /* qgshelpviewer.cpp in Sources */,
14294+
7249EBE010E7BCDA00708435 /* qgshelpviewer.h in Sources */,
14295+
);
14296+
runOnlyForDeploymentPostprocessing = 0;
14297+
};
1422514298
7262ED950F7A770300498385 /* Sources */ = {
1422614299
isa = PBXSourcesBuildPhase;
1422714300
buildActionMask = 2147483647;
@@ -14870,6 +14943,11 @@
1487014943
target = 7225EF1710B2265A00D23EA2 /* labelingplugin */;
1487114944
targetProxy = 7225EF2F10B2273D00D23EA2 /* PBXContainerItemProxy */;
1487214945
};
14946+
7249EBF310E7C0E200708435 /* PBXTargetDependency */ = {
14947+
isa = PBXTargetDependency;
14948+
target = 7249EBD610E7BBEA00708435 /* qgis_help */;
14949+
targetProxy = 7249EBF210E7C0E200708435 /* PBXContainerItemProxy */;
14950+
};
1487314951
7256F1900F411B110022BE1F /* PBXTargetDependency */ = {
1487414952
isa = PBXTargetDependency;
1487514953
target = 72A07D140F3BD625004FC2A4 /* delimitedtextprovider */;
@@ -14995,11 +15073,6 @@
1499515073
target = 729BBE720F4075D1001BCB63 /* All Plugins */;
1499615074
targetProxy = 7256F1CC0F411CDD0022BE1F /* PBXContainerItemProxy */;
1499715075
};
14998-
7256F1CF0F411CF70022BE1F /* PBXTargetDependency */ = {
14999-
isa = PBXTargetDependency;
15000-
target = 729BBEFE0F40770B001BCB63 /* qgis_help */;
15001-
targetProxy = 7256F1CE0F411CF70022BE1F /* PBXContainerItemProxy */;
15002-
};
1500315076
7256F1D10F411D080022BE1F /* PBXTargetDependency */ = {
1500415077
isa = PBXTargetDependency;
1500515078
target = 8D0C4E890486CD37000505A6 /* Qgis */;
@@ -15546,6 +15619,61 @@
1554615619
};
1554715620
name = Release;
1554815621
};
15622+
7249EBD910E7BBEB00708435 /* Debug */ = {
15623+
isa = XCBuildConfiguration;
15624+
buildSettings = {
15625+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS";
15626+
GCC_OPTIMIZATION_LEVEL = 0;
15627+
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
15628+
HEADER_SEARCH_PATHS = (
15629+
"$(inherited)",
15630+
../../src/core,
15631+
"$(SQLITE_INC)",
15632+
);
15633+
INSTALL_PATH = /usr/local/bin;
15634+
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
15635+
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
15636+
OTHER_LDFLAGS = (
15637+
"$(inherited)",
15638+
"$(SQLITE_LIB)",
15639+
"$(QT_LIB_CORE)",
15640+
"$(QT_LIB_GUI)",
15641+
"$(QT_LIB_NET)",
15642+
"$(QT_LIB_SVG)",
15643+
"$(QT_LIB_XML)",
15644+
"$(QT_LIB_WEBKIT)",
15645+
);
15646+
PRODUCT_NAME = qgis_help;
15647+
};
15648+
name = Debug;
15649+
};
15650+
7249EBDA10E7BBEB00708435 /* Release */ = {
15651+
isa = XCBuildConfiguration;
15652+
buildSettings = {
15653+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS";
15654+
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
15655+
HEADER_SEARCH_PATHS = (
15656+
"$(inherited)",
15657+
../../src/core,
15658+
"$(SQLITE_INC)",
15659+
);
15660+
INSTALL_PATH = /usr/local/bin;
15661+
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
15662+
OTHER_CFLAGS = "$(QT_CXXFLAGS)";
15663+
OTHER_LDFLAGS = (
15664+
"$(inherited)",
15665+
"$(SQLITE_LIB)",
15666+
"$(QT_LIB_CORE)",
15667+
"$(QT_LIB_GUI)",
15668+
"$(QT_LIB_NET)",
15669+
"$(QT_LIB_SVG)",
15670+
"$(QT_LIB_XML)",
15671+
"$(QT_LIB_WEBKIT)",
15672+
);
15673+
PRODUCT_NAME = qgis_help;
15674+
};
15675+
name = Release;
15676+
};
1554915677
7256F1550F4105770022BE1F /* Debug */ = {
1555015678
isa = XCBuildConfiguration;
1555115679
buildSettings = {
@@ -17924,7 +18052,7 @@
1792418052
COPY_PHASE_STRIP = NO;
1792518053
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
1792618054
GCC_OPTIMIZATION_LEVEL = 0;
17927-
QGIS_VERSION_BUILD = 12617;
18055+
QGIS_VERSION_BUILD = 12622;
1792818056
STRIP_INSTALLED_PRODUCT = NO;
1792918057
};
1793018058
name = Debug;
@@ -17935,7 +18063,7 @@
1793518063
buildSettings = {
1793618064
COPY_PHASE_STRIP = YES;
1793718065
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
17938-
QGIS_VERSION_BUILD = 12617;
18066+
QGIS_VERSION_BUILD = 12622;
1793918067
STRIP_INSTALLED_PRODUCT = YES;
1794018068
};
1794118069
name = Release;
@@ -18006,6 +18134,15 @@
1800618134
defaultConfigurationIsVisible = 0;
1800718135
defaultConfigurationName = Release;
1800818136
};
18137+
7249EBDB10E7BC1300708435 /* Build configuration list for PBXNativeTarget "qgis_help" */ = {
18138+
isa = XCConfigurationList;
18139+
buildConfigurations = (
18140+
7249EBD910E7BBEB00708435 /* Debug */,
18141+
7249EBDA10E7BBEB00708435 /* Release */,
18142+
);
18143+
defaultConfigurationIsVisible = 0;
18144+
defaultConfigurationName = Release;
18145+
};
1800918146
7256F1570F4105A40022BE1F /* Build configuration list for PBXAggregateTarget "python_modules" */ = {
1801018147
isa = XCConfigurationList;
1801118148
buildConfigurations = (
@@ -18078,7 +18215,7 @@
1807818215
defaultConfigurationIsVisible = 0;
1807918216
defaultConfigurationName = Release;
1808018217
};
18081-
729BBF040F40770C001BCB63 /* Build configuration list for PBXNativeTarget "qgis_help" */ = {
18218+
729BBF040F40770C001BCB63 /* Build configuration list for PBXNativeTarget "qgis_help app" */ = {
1808218219
isa = XCConfigurationList;
1808318220
buildConfigurations = (
1808418221
729BBF020F40770C001BCB63 /* Debug */,

0 commit comments

Comments
 (0)
Please sign in to comment.