@@ -38,6 +38,8 @@ if not os.path.isdir("./core"):
38
38
os.mkdir("./core")
39
39
if not os.path.isdir("./gui"):
40
40
os.mkdir("./gui")
41
+ if not os.path.isdir("./analysis"):
42
+ os.mkdir("./analysis")
41
43
42
44
##########################################################################
43
45
# SIP -> *.CPP + *.H
@@ -46,6 +48,7 @@ if not os.path.isdir("./gui"):
46
48
# system.
47
49
build_file_core = build_path + "/python/core/core.sbf"
48
50
build_file_gui = build_path + "/python/gui/gui.sbf"
51
+ build_file_analysis = build_path + "/python/analysis/analysis.sbf"
49
52
50
53
# Get the SIP configuration information.
51
54
config = PyQt4.pyqtconfig.Configuration()
@@ -61,6 +64,7 @@ mod_dir = os.path.join(config.default_mod_dir, "qgis")
61
64
# directory where sip files will be installed
62
65
sip_dir_core = os.path.join(config.default_sip_dir, "qgis/core")
63
66
sip_dir_gui = os.path.join(config.default_sip_dir, "qgis/gui")
67
+ sip_dir_analysis = os.path.join(config.default_sip_dir, "qgis/analysis")
64
68
65
69
# Run SIP to generate the code.
66
70
print "Parsing SIP files for 'core' library..."
@@ -73,6 +77,11 @@ cmd = " ".join([config.sip_bin, "-c", "gui", "-b", build_file_gui, "-I", python_
73
77
print cmd
74
78
os.system(cmd)
75
79
80
+ print "Parsing SIP files for 'analysis' library..."
81
+ cmd = " ".join([config.sip_bin, "-c", "analysis", "-b", build_file_analysis, "-I", python_path, "-I", config.pyqt_sip_dir, qt_sip_flags, python_path + "/analysis/analysis.sip"])
82
+ print cmd
83
+ os.system(cmd)
84
+
76
85
77
86
##########################################################################
78
87
# MAKEFILES
@@ -83,12 +92,13 @@ print "Creating makefiles..."
83
92
# its configuration module.
84
93
installs = []
85
94
86
- # directories relative to core (gui) directories
95
+ # directories relative to core (gui, analysis ) directories
87
96
installs.append([[python_path + "__init__.py", python_path + "qgisconfig.py"], mod_dir])
88
97
89
98
90
99
installs_core = copy.copy(installs)
91
100
installs_gui = copy.copy(installs)
101
+ installs_analysis = copy.copy(installs)
92
102
93
103
# install all sip files
94
104
sips_core = glob.glob(python_path + "/core/*.sip")
@@ -98,6 +108,10 @@ for sip in sips_core:
98
108
sips_gui = glob.glob(python_path + "/gui/*.sip")
99
109
for sip in sips_gui:
100
110
installs_gui.append([os.path.basename(sip), sip_dir_gui])
111
+
112
+ sips_analysis = glob.glob(python_path + "/analysis/*.sip")
113
+ for sip in sips_analysis:
114
+ installs_analysis.append([os.path.basename(sip), sip_dir_analysis])
101
115
102
116
103
117
# Create the Makefile. The QtModuleMakefile class provided by the
@@ -120,9 +134,18 @@ makefile_gui = sipconfig.ModuleMakefile(
120
134
install_dir=mod_dir,
121
135
dir="gui",
122
136
universal=osx_universal)
137
+
138
+ makefile_analysis = sipconfig.ModuleMakefile(
139
+ configuration=config,
140
+ qt=qt_libs,
141
+ build_file=build_file_analysis,
142
+ installs=installs_analysis,
143
+ install_dir=mod_dir,
144
+ dir="analysis",
145
+ universal=osx_universal)
123
146
124
- # common settings for both core and gui libs
125
- for mk in [ makefile_core, makefile_gui ]:
147
+ # common settings for core, gui and analysis libs
148
+ for mk in [ makefile_core, makefile_gui, makefile_analysis ]:
126
149
mk.extra_lflags.extend( "@CMAKE_MODULE_LINKER_FLAGS@".strip(' ').split(' ') )
127
150
mk.extra_libs = ["qgis_core"]
128
151
mk.extra_lib_dirs = [build_path+"/src/core"+intdir]
@@ -145,9 +168,18 @@ makefile_gui.extra_include_dirs.append(build_path+"/src/ui")
145
168
makefile_gui.extra_include_dirs.append(src_path+"/src/plugins") # because of qgisplugin.h TODO: sort out
146
169
makefile_gui.extra_cxxflags.append("-DGUI_EXPORT="+export)
147
170
171
+ # more settings for analysis lib
172
+ makefile_analysis.extra_libs.append("qgis_analysis")
173
+ makefile_analysis.extra_lib_dirs.append(build_path+"/src/analysis/vector"+intdir)
174
+ makefile_analysis.extra_include_dirs.append(src_path+"/src/analysis/vector")
175
+ makefile_analysis.extra_include_dirs.append(build_path+"/src/analysis/vector")
176
+ makefile_analysis.extra_include_dirs.append(src_path+"/src/plugins") # because of qgisplugin.h TODO: sort out
177
+ makefile_analysis.extra_cxxflags.append("-DANALYSIS_EXPORT="+export)
178
+
148
179
# Generate the Makefile itself.
149
180
makefile_core.generate()
150
181
makefile_gui.generate()
182
+ makefile_analysis.generate()
151
183
152
184
##########################################################################
153
185
# QGIS CONFIG
0 commit comments