jib-profiles.js (2102:a4d461b24f3a) jib-profiles.js (2129:044ba47e4f8d)
1/*
2 * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. Oracle designates this
8 * particular file as subject to the "Classpath" exception as provided

--- 240 unchanged lines hidden (view full) ---

249 },
250
251 "linux-x86": {
252 target_os: "linux",
253 target_cpu: "x86",
254 build_cpu: "x64",
255 dependencies: concat(common.dependencies, "devkit"),
256 configure_args: concat(common.configure_args, common.configure_args_32bit,
1/*
2 * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. Oracle designates this
8 * particular file as subject to the "Classpath" exception as provided

--- 240 unchanged lines hidden (view full) ---

249 },
250
251 "linux-x86": {
252 target_os: "linux",
253 target_cpu: "x86",
254 build_cpu: "x64",
255 dependencies: concat(common.dependencies, "devkit"),
256 configure_args: concat(common.configure_args, common.configure_args_32bit,
257 "--with-jvm-variants=minimal,client,server", "--with-zlib=system"),
257 "--with-jvm-variants=minimal,server", "--with-zlib=system"),
258 default_make_targets: common.default_make_targets
259 },
260
261 "macosx-x64": {
262 target_os: "macosx",
263 target_cpu: "x64",
264 dependencies: concat(common.dependencies, "devkit"),
265 configure_args: concat(common.configure_args, "--with-zlib=system"),

--- 24 unchanged lines hidden (view full) ---

290 default_make_targets: common.default_make_targets
291 },
292
293 "windows-x86": {
294 target_os: "windows",
295 target_cpu: "x86",
296 build_cpu: "x64",
297 dependencies: concat(common.dependencies, "devkit", "freetype"),
258 default_make_targets: common.default_make_targets
259 },
260
261 "macosx-x64": {
262 target_os: "macosx",
263 target_cpu: "x64",
264 dependencies: concat(common.dependencies, "devkit"),
265 configure_args: concat(common.configure_args, "--with-zlib=system"),

--- 24 unchanged lines hidden (view full) ---

290 default_make_targets: common.default_make_targets
291 },
292
293 "windows-x86": {
294 target_os: "windows",
295 target_cpu: "x86",
296 build_cpu: "x64",
297 dependencies: concat(common.dependencies, "devkit", "freetype"),
298 configure_args: concat(common.configure_args,
299 "--with-jvm-variants=client,server", common.configure_args_32bit),
298 configure_args: concat(common.configure_args, common.configure_args_32bit),
300 default_make_targets: common.default_make_targets
301 }
302 };
303 profiles = concatObjects(profiles, mainProfiles);
304 // Generate debug versions of all the main profiles
305 profiles = concatObjects(profiles, generateDebugProfiles(common, mainProfiles));
306 // Generate slowdebug versions of all the main profiles
307 profiles = concatObjects(profiles, generateSlowdebugProfiles(common, mainProfiles));

--- 5 unchanged lines hidden (view full) ---

313 // produce the compact profile images by default. This adds "profiles" as an
314 // extra default target.
315 var openOnlyProfilesExtra = {
316 "linux-x64-open": {
317 default_make_targets: "profiles"
318 },
319
320 "linux-x86-open": {
299 default_make_targets: common.default_make_targets
300 }
301 };
302 profiles = concatObjects(profiles, mainProfiles);
303 // Generate debug versions of all the main profiles
304 profiles = concatObjects(profiles, generateDebugProfiles(common, mainProfiles));
305 // Generate slowdebug versions of all the main profiles
306 profiles = concatObjects(profiles, generateSlowdebugProfiles(common, mainProfiles));

--- 5 unchanged lines hidden (view full) ---

312 // produce the compact profile images by default. This adds "profiles" as an
313 // extra default target.
314 var openOnlyProfilesExtra = {
315 "linux-x64-open": {
316 default_make_targets: "profiles"
317 },
318
319 "linux-x86-open": {
321 default_make_targets: "profiles",
322 configure_args: "--with-jvm-variants=client,server"
320 default_make_targets: "profiles"
323 }
324 };
325 var openOnlyProfiles = concatObjects(openOnlyProfiles, openOnlyProfilesExtra);
326
327 profiles = concatObjects(profiles, openOnlyProfiles);
328 // Generate debug profiles for the open jprt profiles
329 profiles = concatObjects(profiles, generateDebugProfiles(common, openOnlyProfiles));
330

--- 311 unchanged lines hidden --- 		321 }
322 };
323 var openOnlyProfiles = concatObjects(openOnlyProfiles, openOnlyProfilesExtra);
324
325 profiles = concatObjects(profiles, openOnlyProfiles);
326 // Generate debug profiles for the open jprt profiles
327 profiles = concatObjects(profiles, generateDebugProfiles(common, openOnlyProfiles));
328

--- 311 unchanged lines hidden ---