commit d79c2777c75b9e5e1d566960e2ed98e1a0e41449
parent a76a1ccf8e0d648a354e2354ad5456c8293d4bbc
Author: Florian Dold <florian.dold@gmail.com>
Date: Mon, 14 Oct 2019 22:39:12 +0530
build system
Diffstat:
7 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "build-scripts"]
- path = build-scripts
+ path = build-system/taler-build-scripts
url = git://taler.net/taler-build-scripts
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ ava = node_modules/ava/cli.js
nyc = node_modules/nyc/bin/nyc.js
tslint = node_modules/tslint/bin/tslint
--include config.mk
+include config.mk
.PHONY: tsc
tsc: tsconfig.json yarn-install
@@ -39,10 +39,8 @@ typedoc:
clean:
rm -rf dist/ config.mk
-submodules/init:
- git submodule update --init --recursive
-
-submodules/update:
+.PHONY: submodules-update
+submodules-update:
git submodule update --recursive --remote
.PHONY: check
@@ -59,7 +57,7 @@ lint: tsc yarn-install
.PHONY: yarn-install
yarn-install:
- $(yarnexe) install
+ $(yarn) install
.PHONY: i18n
@@ -89,10 +87,9 @@ else
.PHONY: install
install: tsc
@echo "installing to" $(prefix)
- yarn global add file://$(CURDIR) --prefix $(prefix)
+ $(yarn) global add file://$(CURDIR) --prefix $(prefix)
endif
.PHONY: watch
watch: tsconfig.json
-
./node_modules/.bin/webpack --watch
diff --git a/bootstrap b/bootstrap
@@ -1,6 +1,14 @@
#!/bin/sh
-git submodule update --init --recursive
-git submodule update --recursive --remote
-ln -sf build-scripts/configure configure
-ln -sf build-scripts/configure.py configure.py
+# Bootstrap the repository. Used when the repository is checked out from git.
+# When using the source tarball, running this script is not necessary.
+
+set -eu
+
+if ! git --version >/dev/null; then
+ echo "git not installed"
+ exit 1
+fi
+
+git submodule update --init
+cp build-system/taler-build-scripts/configure ./configure
diff --git a/build-scripts b/build-scripts
@@ -1 +0,0 @@
-Subproject commit c49278458aad2d2bfbf91b3e4ee4dd1650bf9601
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
@@ -0,0 +1 @@
+Subproject commit b2c9672f2e493db810865b7de1e568a466b59360
diff --git a/configure b/configure
diff --git a/configure.py b/configure.py
