From 09a837c74544c7790a58c53e36f305f1aa648961 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:01:57 -0300 Subject: [PATCH 01/14] fix license --- .../windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs b/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs index a45d6b6eb..7b858d147 100644 --- a/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs +++ b/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs @@ -19,7 +19,7 @@ {{if gt (.License | len) 0}} - + {{end}} From 4a215578fbe5239b23ce4bc9f0b45219ab5fcd25 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:11:27 -0300 Subject: [PATCH 02/14] fix license --- .circleci/scripts/gen-win.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/scripts/gen-win.ps1 b/.circleci/scripts/gen-win.ps1 index 360bf82ce..ec29a2d1e 100644 --- a/.circleci/scripts/gen-win.ps1 +++ b/.circleci/scripts/gen-win.ps1 @@ -42,7 +42,7 @@ $release_version=$(Get-Content .\workspace\dist\release_version.txt) mkdir dist\installer -copy LICENSE.rtf packaging/windows +copy LICENSE packaging/windows cd packaging\windows From f5959c0128fbbdeb9d53e54c39559d5c051a0506 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:14:45 -0300 Subject: [PATCH 03/14] Add license --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..906187612 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020 ZUP IT SERVICOS EM TECNOLOGIA E INOVACAO SA + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file From ca143a6edab313410495fbc265a55549ab9d6290 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:21:01 -0300 Subject: [PATCH 04/14] changes --- .circleci/config.yml | 1 + .../windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 52a832bcb..6b1708916 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -231,6 +231,7 @@ jobs: command: | sudo apt-get update -y sudo apt-get install -y osslsigncode + ls -R dist osslsigncode sign -pkcs12 packaging/windows/ZupIT.pfx -pass "$SIGN_CODE" -n "Ritchie CLI ZupIT" -h sha256 -t http://timestamp.digicert.com/ -in dist/installer/ritchiecli.msi -out dist/installer/ritchiecli.msi - persist_to_workspace: root: dist diff --git a/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs b/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs index 7b858d147..a45d6b6eb 100644 --- a/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs +++ b/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs @@ -19,7 +19,7 @@ {{if gt (.License | len) 0}} - + {{end}} From c28d730205e269e62dfc7bb42a1be27f715a83ce Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:27:07 -0300 Subject: [PATCH 05/14] fix config --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6b1708916..52a832bcb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -231,7 +231,6 @@ jobs: command: | sudo apt-get update -y sudo apt-get install -y osslsigncode - ls -R dist osslsigncode sign -pkcs12 packaging/windows/ZupIT.pfx -pass "$SIGN_CODE" -n "Ritchie CLI ZupIT" -h sha256 -t http://timestamp.digicert.com/ -in dist/installer/ritchiecli.msi -out dist/installer/ritchiecli.msi - persist_to_workspace: root: dist From 985e356f0b62169e45dc392a3927cc59cd9473dc Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:29:03 -0300 Subject: [PATCH 06/14] wix.json --- packaging/windows/wix.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/wix.json b/packaging/windows/wix.json index 427b60032..d3ec84741 100644 --- a/packaging/windows/wix.json +++ b/packaging/windows/wix.json @@ -1,7 +1,7 @@ { "product": "rit", "company": "ZupIT", - "license": "LICENSE", + "license": "C:\\workspace\\packaging\\windows\\LICENSE.rtf", "upgrade-code": "978a8f0d-0720-4c7a-a40c-71edf98ba660", "files": { "guid": "ebdf3311-3856-4b44-99d4-d77bc264e208", From cc4125d34fe53c27de9dd88da81e5e1f3b36fee9 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:33:22 -0300 Subject: [PATCH 07/14] add license.rtf --- LICENSE.rtf => packaging/windows/LICENSE.rtf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE.rtf => packaging/windows/LICENSE.rtf (100%) diff --git a/LICENSE.rtf b/packaging/windows/LICENSE.rtf similarity index 100% rename from LICENSE.rtf rename to packaging/windows/LICENSE.rtf From af29f2af0b2dac4aa7e2a19068af7adfb4adbd06 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:37:56 -0300 Subject: [PATCH 08/14] Add gen-win --- .circleci/scripts/gen-win.ps1 | 2 +- packaging/windows/LICENSE.rtf => LICENSE.rtf | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packaging/windows/LICENSE.rtf => LICENSE.rtf (100%) diff --git a/.circleci/scripts/gen-win.ps1 b/.circleci/scripts/gen-win.ps1 index ec29a2d1e..360bf82ce 100644 --- a/.circleci/scripts/gen-win.ps1 +++ b/.circleci/scripts/gen-win.ps1 @@ -42,7 +42,7 @@ $release_version=$(Get-Content .\workspace\dist\release_version.txt) mkdir dist\installer -copy LICENSE packaging/windows +copy LICENSE.rtf packaging/windows cd packaging\windows diff --git a/packaging/windows/LICENSE.rtf b/LICENSE.rtf similarity index 100% rename from packaging/windows/LICENSE.rtf rename to LICENSE.rtf From 9b2d1f5dfd6b48695f2c7eab621f29caf3d0d6d1 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 15:49:20 -0300 Subject: [PATCH 09/14] change wxs --- .../windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs b/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs index a45d6b6eb..7b858d147 100644 --- a/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs +++ b/packaging/windows/ritchie-wix-templates/LicenseAgreementDlg_HK.wxs @@ -19,7 +19,7 @@ {{if gt (.License | len) 0}} - + {{end}} From b290539e44fcda2cb241f06f41d5603fa9579146 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 16:02:31 -0300 Subject: [PATCH 10/14] fix json --- packaging/windows/wix.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/wix.json b/packaging/windows/wix.json index d3ec84741..32d908cfa 100644 --- a/packaging/windows/wix.json +++ b/packaging/windows/wix.json @@ -1,7 +1,7 @@ { "product": "rit", "company": "ZupIT", - "license": "C:\\workspace\\packaging\\windows\\LICENSE.rtf", + "license": "..\\..\\workspace\\packaging\\windows\\LICENSE.rtf", "upgrade-code": "978a8f0d-0720-4c7a-a40c-71edf98ba660", "files": { "guid": "ebdf3311-3856-4b44-99d4-d77bc264e208", From 1ab94eea646ffabcfb1e6889809769cdb620a5ad Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 16:08:59 -0300 Subject: [PATCH 11/14] fix license --- packaging/windows/wix.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/wix.json b/packaging/windows/wix.json index 32d908cfa..ffb5e6a01 100644 --- a/packaging/windows/wix.json +++ b/packaging/windows/wix.json @@ -1,7 +1,7 @@ { "product": "rit", "company": "ZupIT", - "license": "..\\..\\workspace\\packaging\\windows\\LICENSE.rtf", + "license": "C:\\workspace\\workspace\\packaging\\windows\\LICENSE.rtf", "upgrade-code": "978a8f0d-0720-4c7a-a40c-71edf98ba660", "files": { "guid": "ebdf3311-3856-4b44-99d4-d77bc264e208", From 0e45563269073ea12c98a8480b2b0a5bd63aa17c Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 16:14:23 -0300 Subject: [PATCH 12/14] fix license --- packaging/windows/wix.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/wix.json b/packaging/windows/wix.json index ffb5e6a01..d3ec84741 100644 --- a/packaging/windows/wix.json +++ b/packaging/windows/wix.json @@ -1,7 +1,7 @@ { "product": "rit", "company": "ZupIT", - "license": "C:\\workspace\\workspace\\packaging\\windows\\LICENSE.rtf", + "license": "C:\\workspace\\packaging\\windows\\LICENSE.rtf", "upgrade-code": "978a8f0d-0720-4c7a-a40c-71edf98ba660", "files": { "guid": "ebdf3311-3856-4b44-99d4-d77bc264e208", From 7b723c2dc510e16ba69314c6fb6e7866a48c8b48 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 16:22:38 -0300 Subject: [PATCH 13/14] fix license --- .circleci/scripts/gen-win.ps1 | 2 -- LICENSE.rtf => packaging/windows/LICENSE.rtf | 0 2 files changed, 2 deletions(-) rename LICENSE.rtf => packaging/windows/LICENSE.rtf (100%) diff --git a/.circleci/scripts/gen-win.ps1 b/.circleci/scripts/gen-win.ps1 index 360bf82ce..eb6800be4 100644 --- a/.circleci/scripts/gen-win.ps1 +++ b/.circleci/scripts/gen-win.ps1 @@ -42,8 +42,6 @@ $release_version=$(Get-Content .\workspace\dist\release_version.txt) mkdir dist\installer -copy LICENSE.rtf packaging/windows - cd packaging\windows Write-Output 'GENERATING WIX MSI TEMPLATE' diff --git a/LICENSE.rtf b/packaging/windows/LICENSE.rtf similarity index 100% rename from LICENSE.rtf rename to packaging/windows/LICENSE.rtf From 87f1e6c1c56d4f4f147da9c6f0946964fd4f24f7 Mon Sep 17 00:00:00 2001 From: Ernelio Vieira Date: Tue, 4 Aug 2020 16:29:09 -0300 Subject: [PATCH 14/14] change version qa --- .circleci/scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/scripts/version.sh b/.circleci/scripts/version.sh index d8e6290eb..7eeb8f2df 100755 --- a/.circleci/scripts/version.sh +++ b/.circleci/scripts/version.sh @@ -1,7 +1,7 @@ #!/bin/sh if expr "$CIRCLE_BRANCH" : 'qa' >/dev/null; then - export RELEASE_VERSION="1.0.0-qa" + export RELEASE_VERSION="2.0.0-qa" elif expr "$CIRCLE_BRANCH" : '^release-.*' >/dev/null; then export RELEASE_VERSION=$(echo "$CIRCLE_BRANCH" | cut -d '-' -f 2-) elif expr "$CIRCLE_BRANCH" : '^nightly' >/dev/null; then