File tree Expand file tree Collapse file tree 3 files changed +23
-14
lines changed
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library Expand file tree Collapse file tree 3 files changed +23
-14
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ def runOnNativeBuildAgent(String platform, Closure body) {
19
19
def final nativeBuildStageName = ' Build SWT-native binaries'
20
20
if (platform == ' gtk.linux.x86_64' ) {
21
21
podTemplate(inheritFrom : ' ubuntu-latest' /* inhert general configuration */ , containers : [
22
- containerTemplate(name : ' swtbuild' , image : ' eclipse/platformreleng-centos-swt-build:8 ' ,
22
+ containerTemplate(name : ' swtbuild' , image : ' eclipse/platformreleng-debian-swtnativebuild:12 ' ,
23
23
resourceRequestCpu :' 1000m' , resourceRequestMemory :' 512Mi' ,
24
24
resourceLimitCpu :' 2000m' , resourceLimitMemory :' 4096Mi' ,
25
25
alwaysPullImage : true , command : ' cat' , ttyEnabled : true )
@@ -228,7 +228,15 @@ pipeline {
228
228
if (isUnix()){
229
229
sh '''
230
230
mkdir libs
231
- sh build.sh install
231
+ if [ "${PLATFORM}" = "gtk.linux.aarch64" ]; then
232
+ sh build.sh -gtk3 install
233
+ elif [ "${PLATFORM}" = "gtk.linux.ppc64le" ]; then
234
+ sh build.sh -gtk3 install
235
+ elif [ "${PLATFORM}" = "gtk.linux.riscv64" ]; then
236
+ sh build.sh -gtk3 install
237
+ else
238
+ sh build.sh install
239
+ fi
232
240
ls -1R libs
233
241
'''
234
242
} else {
Original file line number Diff line number Diff line change 135
135
</exec >
136
136
</then >
137
137
<else >
138
- <property name =" gtk_version" value =" 3.0" />
139
138
<exec dir =" ${build_dir}" executable =" sh" failonerror =" true" >
140
139
<arg line =" build.sh" />
141
140
<env key =" SWT_JAVA_HOME" value =" ${SWT_JAVA_HOME}" />
142
141
<env key =" OUTPUT_DIR" value =" ${project.basedir}" />
143
- <env key =" GTK_VERSION" value =" ${gtk_version}" />
144
142
<env key =" MODEL" value =" ${arch}" />
145
143
<arg line =" install clean" />
146
144
</exec >
Original file line number Diff line number Diff line change @@ -280,22 +280,25 @@ func_build_gtk3 () {
280
280
fi
281
281
}
282
282
283
- if [ " $1 " = " -gtk-all" ]; then
284
- shift
285
- func_echo_plus " Note: When building multiple GTK versions, a cleanup is required (and automatically performed) between them."
286
- func_clean_up
287
- func_build_gtk4 " $@ "
288
- func_clean_up
289
- func_build_gtk3 " $@ "
290
- elif [ " $1 " = " -gtk4" ]; then
283
+ if [ " $1 " = " -gtk4" ]; then
291
284
shift
292
285
func_build_gtk4 " $@ "
293
286
elif [ " $1 " = " -gtk3" ]; then
294
287
shift
295
288
func_build_gtk3 " $@ "
296
289
elif [ " ${GTK_VERSION} " = " 4.0" ]; then
297
290
func_build_gtk4 " $@ "
298
- elif [ " ${GTK_VERSION} " = " 3.0" -o " ${GTK_VERSION} " = " " ]; then
299
- export GTK_VERSION=" 3.0"
291
+ elif [ " ${GTK_VERSION} " = " 3.0" ]; then
292
+ func_build_gtk3 " $@ "
293
+ else
294
+ if [ " $1 " = " -gtk-all" ]; then
295
+ shift
296
+ fi
297
+ func_echo_plus " ==== Building GTK3 + GTK 4 ===="
298
+ func_echo_plus " Note: When building multiple GTK versions, a cleanup is required (and automatically performed) between them."
299
+ func_clean_up
300
+ func_build_gtk4 " $@ "
301
+ func_echo_plus " Note: When building multiple GTK versions, a cleanup is required (and automatically performed) between them."
302
+ func_clean_up
300
303
func_build_gtk3 " $@ "
301
304
fi
You can’t perform that action at this time.
0 commit comments