summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xintro5
-rwxr-xr-xintro2-tour2
-rw-r--r--intro2-tour.orig14
3 files changed, 10 insertions, 11 deletions
diff --git a/intro b/intro
index 6b2b747..d7dfed0 100755
--- a/intro
+++ b/intro
@@ -45,10 +45,9 @@ hello2=hello/hello2
show=n
prompt=-y
-# Add for both build2.org and stage.build2.org.
+# Add for **build2.org.
#
-trust="--trust FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30:56:B9:77:B9:F2:01:94"
-trust+=" --trust 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65"
+trust="--trust EC:50:13:E2:3D:F7:92:B4:50:0B:BF:2A:1F:7D:31:04:C6:57:6F:BC:BE:04:2E:E0:58:14:FA:66:66:21:1F:14"
c1=g++-5
c2=clang++-3.6
diff --git a/intro2-tour b/intro2-tour
index 8d8aceb..6f8c2a9 100755
--- a/intro2-tour
+++ b/intro2-tour
@@ -21,7 +21,7 @@ gcc=g++
clang=clang++-5.0
msvc=cl-15
repo=https://stage.build2.org/1/
-trust="37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65"
+trust="EC:50:13:E2:3D:F7:92:B4:50:0B:BF:2A:1F:7D:31:04:C6:57:6F:BC:BE:04:2E:E0:58:14:FA:66:66:21:1F:14"
function show () # <cmd> ...
{
diff --git a/intro2-tour.orig b/intro2-tour.orig
index c3bcb2a..fafd36b 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -181,7 +181,7 @@ ld ../hello-mingw/hello/hello/exe{hello}
test hello/testscript{testscript}@../hello-mingw/hello/hello/ ../hello-mingw/hello/hello/exe{hello}
+ ../hello-mingw/hello/hello/hello.exe Windows
-Hello, Windows!
+Hello, Windows!
+ git add .
@@ -267,7 +267,7 @@ fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
warning: authenticity of the certificate for repository pkg:stage.build2.org cannot be established
certificate is for **stage.build2.org, "Code Synthesis" <stage-admin@build2.org>
certificate SHA256 fingerprint:
-37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65
+EC:50:13:E2:3D:F7:92:B4:50:0B:BF:2A:1F:7D:31:04:C6:57:6F:BC:BE:04:2E:E0:58:14:FA:66:66:21:1F:14
trust this certificate? [y/n] hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.19700101000000#1
+ bdep sync
@@ -534,7 +534,7 @@ url: https://example.org/hello
src_root: /tmp/hello/
out_root: /tmp/hello-gcc/hello/
amalgamation: ../
-subprojects:
+subprojects:
operations: update clean test update-for-test install uninstall update-for-install
meta-operations: perform configure disfigure dist info
@@ -590,10 +590,10 @@ publishing:
control: https://github.com/boris-kolpackov/hello.git
warning: publishing using staged build2 toolchain
continue? [y/n] pushing branch build2-control
-remote:
-remote: Create a pull request for 'build2-control' on GitHub by visiting:
-remote: https://github.com/boris-kolpackov/hello/pull/new/build2-control
-remote:
+remote:
+remote: Create a pull request for 'build2-control' on GitHub by visiting:
+remote: https://github.com/boris-kolpackov/hello/pull/new/build2-control
+remote:
Branch 'build2-control' set up to track remote branch 'build2-control' from 'origin'.
submitting hello-0.1.0.tar.gz
% Total % Received % Xferd Average Speed Time Time Time Current