[buildstream] 20/21: WIP: win32: adjust examples/running-commands

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

not-in-ldap pushed a commit to branch aevri/win32
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 68f9c1ace24f385886fa9b98a8725a55f1caa1da
Author: Angelos Evripiotis <je...@bloomberg.net>
AuthorDate: Thu Apr 18 09:53:07 2019 +0100

    WIP: win32: adjust examples/running-commands
    
    Illustrate some of the changes necessary to run on win32 without a
    sandbox.
---
 doc/examples/running-commands/elements/base.bst        |  5 -----
 doc/examples/running-commands/elements/base/alpine.bst | 13 -------------
 doc/examples/running-commands/elements/hello.bst       | 11 +++--------
 doc/examples/running-commands/files/src/Makefile       | 12 ------------
 doc/examples/running-commands/project.conf             | 11 ++++++++---
 5 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/doc/examples/running-commands/elements/base.bst b/doc/examples/running-commands/elements/base.bst
deleted file mode 100644
index 1b85a9e..0000000
--- a/doc/examples/running-commands/elements/base.bst
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: stack
-description: Base stack
-
-depends:
-- base/alpine.bst
diff --git a/doc/examples/running-commands/elements/base/alpine.bst b/doc/examples/running-commands/elements/base/alpine.bst
deleted file mode 100644
index cf85df5..0000000
--- a/doc/examples/running-commands/elements/base/alpine.bst
+++ /dev/null
@@ -1,13 +0,0 @@
-kind: import
-description: |
-
-    Alpine Linux base runtime
-
-sources:
-- kind: tar
-
-  # This is a post doctored, trimmed down system image
-  # of the Alpine linux distribution.
-  #
-  url: alpine:integration-tests-base.v1.x86_64.tar.xz
-  ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639
diff --git a/doc/examples/running-commands/elements/hello.bst b/doc/examples/running-commands/elements/hello.bst
index f7f21e0..184d353 100644
--- a/doc/examples/running-commands/elements/hello.bst
+++ b/doc/examples/running-commands/elements/hello.bst
@@ -3,10 +3,6 @@ description: |
 
   Building manually
 
-# Depend on the base system
-depends:
-- base.bst
-
 # Stage the files/src directory for building
 sources:
   - kind: local
@@ -16,7 +12,6 @@ sources:
 config:
 
   build-commands:
-  - make PREFIX="%{prefix}"
-
-  install-commands:
-  - make -j1 PREFIX="%{prefix}" DESTDIR="%{install-root}" install
+  - cl hello.c
+  - mkdir ..\..\..\buildstream-install
+  - copy hello.exe ..\..\..\buildstream-install
diff --git a/doc/examples/running-commands/files/src/Makefile b/doc/examples/running-commands/files/src/Makefile
deleted file mode 100644
index 8c84251..0000000
--- a/doc/examples/running-commands/files/src/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Sample makefile for hello.c
-#
-.PHONY: all install
-
-all: hello
-
-install:
-	install -d ${DESTDIR}${PREFIX}/bin
-	install -m 755 hello ${DESTDIR}${PREFIX}/bin
-
-hello: hello.c
-	$(CC) -Wall -o $@ $<
diff --git a/doc/examples/running-commands/project.conf b/doc/examples/running-commands/project.conf
index 7127b0d..45ac172 100644
--- a/doc/examples/running-commands/project.conf
+++ b/doc/examples/running-commands/project.conf
@@ -7,6 +7,11 @@ format-version: 9
 # Subdirectory where elements are stored
 element-path: elements
 
-# Define an alias for our alpine tarball
-aliases:
-  alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
+variables:
+  build-root:
+    buildstream\%{project-name}\%{element-name}
+  install-root:
+    buildstream-install
+
+environment:
+  SystemRoot: 'C:\Windows'