equal
deleted
inserted
replaced
777 windows_x64: "2.7.1-v120+1.1", |
777 windows_x64: "2.7.1-v120+1.1", |
778 windows_x86: "2.7.1-v120+1.1", |
778 windows_x86: "2.7.1-v120+1.1", |
779 macosx_x64: "2.7.1-Xcode6.3-MacOSX10.9+1.0" |
779 macosx_x64: "2.7.1-Xcode6.3-MacOSX10.9+1.0" |
780 }[input.target_platform]; |
780 }[input.target_platform]; |
781 |
781 |
|
782 var makeBinDir = (input.build_os == "windows" |
|
783 ? input.get("gnumake", "install_path") + "/cygwin/bin" |
|
784 : input.get("gnumake", "install_path") + "/bin"); |
|
785 |
782 var dependencies = { |
786 var dependencies = { |
783 |
787 |
784 boot_jdk: { |
788 boot_jdk: { |
785 server: "jpg", |
789 server: "jpg", |
786 product: "jdk", |
790 product: "jdk", |
829 |
833 |
830 module: (input.build_os == "windows" |
834 module: (input.build_os == "windows" |
831 ? "gnumake-" + input.build_osenv_platform |
835 ? "gnumake-" + input.build_osenv_platform |
832 : "gnumake-" + input.build_platform), |
836 : "gnumake-" + input.build_platform), |
833 |
837 |
834 configure_args: (input.build_os == "windows" |
838 configure_args: "MAKE=" + makeBinDir + "/make", |
835 ? "MAKE=" + input.get("gnumake", "install_path") + "/cygwin/bin/make" |
839 |
836 : "MAKE=" + input.get("gnumake", "install_path") + "/bin/make"), |
840 environment: { |
837 |
841 "MAKE": makeBinDir + "/make" |
838 environment_path: (input.build_os == "windows" |
842 }, |
839 ? input.get("gnumake", "install_path") + "/cygwin/bin" |
843 |
840 : input.get("gnumake", "install_path") + "/bin") |
844 environment_path: makeBinDir |
841 }, |
845 }, |
842 |
846 |
843 freetype: { |
847 freetype: { |
844 organization: common.organization, |
848 organization: common.organization, |
845 ext: "tar.gz", |
849 ext: "tar.gz", |