Commit Graph

35 Commits

Author SHA1 Message Date
Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-11 15:33:50 -05:00
Scott Romero afb57c9cf6 [stabliziation/2106] update 3rd party license file name to be pulled into the installer package (#2281)
License file name was changed in #2267

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-07-19 18:17:55 -07:00
Terry Michaels d9ec159f0e Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
AMZN-ScottR 585caabd95 [installer/2106-3p-license-fix] replaced 3rd party license url arg with auto generated one from version string
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-12 11:38:05 -07:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
Scott Romero 2480dedcd9 [stabilization/2106] Inclusion of 3rd party license manifest file in installer package (#1483) 2021-06-23 14:07:02 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
scottr b3591fbeb8 Merge branch 'stabilization/2106' into cpack/2106-3p-manifest 2021-06-22 14:06:53 -07:00
scottr 72033a49d7 [cpack/2106-3p-manifest] add 3rd party SPDX license manifest file to package 2021-06-22 09:44:08 -07:00
scottr 26017c1b49 Merge branch 'stabilization/2106' into cpack/jenkins-main 2021-06-20 17:49:23 -07:00
scottr e8f250bed8 [cpack/jenkins-main] rework build tag generation to be at cpack time through LY_INSTALLER_AUTO_GEN_TAG 2021-06-20 14:31:10 -07:00
scottr 8b68aa9f5a [cpack/jenkins-main] rework build tagging to include git repo info in installer job 2021-06-18 16:55:22 -07:00
scottr 071ed777bd [cpack/stabilization/2106-jenkins] removed enforcement of aws profile for s3 upload installer artifacts 2021-06-18 08:33:48 -07:00
scottr 6e727e6ab0 [cpack/stabilization/2106-jenkins] various changes to shorten cpack install path on windows 2021-06-18 08:25:03 -07:00
scottr aa583243f6 [cpack/stabilization/2106-vendor-name] update installer vendor name 2021-06-18 07:53:29 -07:00
scottr 0108953586 [cpack/stabilization/2106] added: welcome page title, package full name. updated: install page title, vendor 2021-06-15 12:51:44 -07:00
scottr 8aa310dff5 [cpack_installer] option to set upload url via environment variable 2021-06-07 15:29:29 -07:00
scottr 57faa2d377 [cpack_installer] installer upload to s3 2021-06-07 15:15:14 -07:00
scottr bcef8856ff [cpack_installer] minor wording fixes 2021-06-03 10:51:13 -07:00
scottr 881c51dc9c [cpack_installer] removed unnecessary explicit use of CMAKE_INSTALL_DEFAULT_COMPONENT_NAME 2021-06-02 22:05:20 -07:00
scottr 602dd01434 [cpack_installer] fixed typo in error message 2021-06-02 22:02:11 -07:00
scottr b09f73378f [cpack_installer] replaced LY_DEFAULT_INSTALL_COMPONENT with built-in CMAKE_INSTALL_DEFAULT_COMPONENT_NAME. updated stale references to ly_install_target_COMPONENT with a get_prop call 2021-06-02 20:49:39 -07:00
scottr cfd06f2e4a [cpack_installer] added check for desired cmake version to be at least greater than minimum required plus minor cleanup 2021-06-02 13:10:11 -07:00
scottr 301bfe3486 [cpack_installer] replaced raw file(DOWNLOAD ...) for download_file() utility 2021-05-26 22:03:46 -07:00
scottr 883ddf667e [cpack_installer] removed static cmake package in favor of using file(DOWNLOAD ...) 2021-05-26 20:19:42 -07:00
scottr 26c55514d5 [ext_project_packaging_fix] replaced incorrect usage of CMAKE_SOURCE_DIR with CMAKE_CURRENT_SOURCE_DIR in cmake packaging scripts 2021-05-24 09:27:03 -07:00
scottr 54dc47eb91 [cpack_installer] fixed typo in help string 2021-05-18 11:50:01 -07:00
scottr 66ad040102 [cpack_installer] some minor comment cleanup 2021-05-17 22:51:48 -07:00
scottr 2ddbd36f9a [cpack_installer] add option to specify license url. replicate online artifacts copy 2021-05-17 16:34:24 -07:00
scottr b19779e491 [cpack_installer] cpack variable usage cleanup 2021-05-17 15:28:32 -07:00
scottr 6d7f7547ec [cpack_installer] fix incorrect caching type of installer download url and add configure of download info 2021-05-14 08:20:59 -07:00
scottr c777e2e353 [cpack_installer] some cpack cleanup and prep for online installer support (pre/post build steps) 2021-05-11 18:07:19 -07:00
scottr efe6d24d51 [cpack_installer] new windows installer basic implementation 2021-05-06 15:51:20 -07:00
Esteban Papp edf8ab4822 Renaming CPack.cmake to Packaging.cmake to avoid infinite recursion (Packaging.cmake includes CPack.cmake) (#533) 2021-05-03 18:55:42 -07:00