Adding stack configuration and updating Makefiles

Soostone · Jun 20, 2015 · d2a2648 · d2a2648
1 parent bd7b0ff
commit d2a2648
Show file tree

Hide file tree

Showing 59 changed files with 90 additions and 274 deletions.
diff --git a/Makefile b/Makefile
@@ -1,25 +1,34 @@
-DEPS ?= core $(wildcard amazonka-*)
+SERVICES  ?= $(wildcard amazonka-*)
+LIBRARIES ?= core amazonka $(SERVICES)
+FORWARD   := sdist upload
 
-.PHONY: full-clean
+build:
+	stack build
+
+test:
+	stack test amazonka-core
+
+clean:
+	stack clean
 
 define forward
-$1: cabal.sandbox.config $$(addprefix $1-,$$(DEPS))
+$1: $$(addprefix $1-,$$(LIBRARIES)
 
 $1-%:
 	@make -C $$* $1
 
 .PHONY: $1
 endef
 
-FORWARD := build configure deps install sdist upload clean doc
-
 $(foreach c,$(FORWARD),$(eval $(call forward, $c)))
 
-full-clean: clean
-	rm -rf cabal.sandbox.config .cabal-sandbox
+.PHONY: $(LIBRARIES)
+
+amazonka:
+	stack build amazonka
 
-cabal.sandbox.config:
-	cabal sandbox init
+core:
+	stack build amazonka-core
 
-travis: cabal.sandbox.config
-	@make -C core test
+$(SERVICES):
+	stack build $@
diff --git a/amazonka-autoscaling/Makefile b/amazonka-autoscaling/Makefile
diff --git a/amazonka-cloudformation/Makefile b/amazonka-cloudformation/Makefile
diff --git a/amazonka-cloudfront/Makefile b/amazonka-cloudfront/Makefile
diff --git a/amazonka-cloudhsm/Makefile b/amazonka-cloudhsm/Makefile
diff --git a/amazonka-cloudsearch-domains/Makefile b/amazonka-cloudsearch-domains/Makefile
diff --git a/amazonka-cloudsearch/Makefile b/amazonka-cloudsearch/Makefile
diff --git a/amazonka-cloudtrail/Makefile b/amazonka-cloudtrail/Makefile
diff --git a/amazonka-cloudwatch-logs/Makefile b/amazonka-cloudwatch-logs/Makefile
diff --git a/amazonka-cloudwatch/Makefile b/amazonka-cloudwatch/Makefile
diff --git a/amazonka-codedeploy/Makefile b/amazonka-codedeploy/Makefile
diff --git a/amazonka-cognito-identity/Makefile b/amazonka-cognito-identity/Makefile
diff --git a/amazonka-cognito-sync/Makefile b/amazonka-cognito-sync/Makefile
diff --git a/amazonka-config/Makefile b/amazonka-config/Makefile
diff --git a/amazonka-datapipeline/Makefile b/amazonka-datapipeline/Makefile
diff --git a/amazonka-directconnect/Makefile b/amazonka-directconnect/Makefile
diff --git a/amazonka-ds/Makefile b/amazonka-ds/Makefile
diff --git a/amazonka-dynamodb/Makefile b/amazonka-dynamodb/Makefile
diff --git a/amazonka-ec2/Makefile b/amazonka-ec2/Makefile
diff --git a/amazonka-ecs/Makefile b/amazonka-ecs/Makefile
diff --git a/amazonka-efs/Makefile b/amazonka-efs/Makefile
diff --git a/amazonka-elasticache/Makefile b/amazonka-elasticache/Makefile
diff --git a/amazonka-elasticbeanstalk/Makefile b/amazonka-elasticbeanstalk/Makefile
diff --git a/amazonka-elastictranscoder/Makefile b/amazonka-elastictranscoder/Makefile
diff --git a/amazonka-elb/Makefile b/amazonka-elb/Makefile
diff --git a/amazonka-emr/Makefile b/amazonka-emr/Makefile
diff --git a/amazonka-glacier/Makefile b/amazonka-glacier/Makefile
diff --git a/amazonka-iam/Makefile b/amazonka-iam/Makefile
diff --git a/amazonka-importexport/Makefile b/amazonka-importexport/Makefile
diff --git a/amazonka-kinesis/Makefile b/amazonka-kinesis/Makefile
diff --git a/amazonka-kms/Makefile b/amazonka-kms/Makefile
diff --git a/amazonka-lambda/Makefile b/amazonka-lambda/Makefile
diff --git a/amazonka-ml/Makefile b/amazonka-ml/Makefile
diff --git a/amazonka-opsworks/Makefile b/amazonka-opsworks/Makefile
diff --git a/amazonka-rds/Makefile b/amazonka-rds/Makefile
diff --git a/amazonka-redshift/Makefile b/amazonka-redshift/Makefile
diff --git a/amazonka-route53-domains/Makefile b/amazonka-route53-domains/Makefile
diff --git a/amazonka-route53/Makefile b/amazonka-route53/Makefile
diff --git a/amazonka-s3/Makefile b/amazonka-s3/Makefile
diff --git a/amazonka-sdb/Makefile b/amazonka-sdb/Makefile
diff --git a/amazonka-ses/Makefile b/amazonka-ses/Makefile
diff --git a/amazonka-sns/Makefile b/amazonka-sns/Makefile
diff --git a/amazonka-sqs/Makefile b/amazonka-sqs/Makefile
diff --git a/amazonka-ssm/Makefile b/amazonka-ssm/Makefile
diff --git a/amazonka-storagegateway/Makefile b/amazonka-storagegateway/Makefile
diff --git a/amazonka-sts/Makefile b/amazonka-sts/Makefile
diff --git a/amazonka-support/Makefile b/amazonka-support/Makefile
diff --git a/amazonka-swf/Makefile b/amazonka-swf/Makefile
diff --git a/amazonka-workspaces/Makefile b/amazonka-workspaces/Makefile
diff --git a/amazonka/Makefile b/amazonka/Makefile
@@ -1,3 +1 @@
-TOP := ..
-
-include $(TOP)/share/library.mk
+include ../share/library.mk
diff --git a/comp/Makefile b/comp/Makefile
@@ -4,11 +4,6 @@ DEPS      := vendor/botocore
 MODEL_DIR := model
 OUT_DIR   := ..
 
-CABAL_INSTALL_DEFARGS ?= -j \
- --disable-documentation \
- --disable-coverage \
- --enable-profiling
-
 define version =
 $(shell sed -n 's/^version: *\(.*\)$$/\1/p' $(1))
 endef
@@ -93,23 +88,15 @@ compile: build
  $(addprefix --model=,$(addprefix $(MODEL_DIR)/,$(MODELS)))
 
 build: $(MODEL_DIR)
-	cabal build $(addprefix -,$(findstring j,$(MAKEFLAGS)))
-
-include ../share/stackage.mk
-
-deps: $(DEPS) cabal.sandbox.config # temporary cabal.config
-	cabal install $(CABAL_INSTALL_DEFARGS) --only-dependencies
+	stack build
 
 clean:
-	cabal clean
-	rm -rf $(MODEL_DIR) cabal.sandbox.config .cabal-sandbox cabal.config
+	stack clean
+	rm -rf $(MODEL_DIR)
 
 full-clean: clean
 	rm -rf $(DEPS)
 
-cabal.sandbox.config:
-	cabal sandbox init
-
 vendor/botocore:
 	git clone [email protected]:boto/botocore $@
 

diff --git a/comp/amazonka-compiler.cabal b/comp/amazonka-compiler.cabal
@@ -47,6 +47,7 @@ executable compile
         , Compiler.Types.NS
         , Compiler.Types.Notation
         , Compiler.Types.Orphans
+        , Compiler.Types.Pager
         , Compiler.Types.Service
         , Compiler.Types.URI
         , Compiler.Types.Waiter
@@ -63,7 +64,7 @@ executable compile
         , data-default-class
         , directory-tree
         , ede
-        , errors
+        , errors               == 2.*
         , formatting
         , free
         , hashable

diff --git a/comp/stack.yaml b/comp/stack.yaml
@@ -1,7 +1,6 @@
 resolver: nightly-2015-06-17
-flags: {}
-packages:
-  - '.'
+flags:    {}
+packages: ['.']
 extra-deps:
   - errors-2.0.0
   - text-regex-replace-0.1.0.1
diff --git a/comp/template/example/makefile.ede b/comp/template/example/makefile.ede
@@ -1,4 +1,7 @@
-TOP    := ../..
-PARENT := {{ libraryName }}
+SHELL := /usr/bin/env bash
 
-include $(TOP)/share/examples.mk
+build:
+	stack build
+
+clean:
+	stack clean
diff --git a/core/Makefile b/core/Makefile
@@ -1,14 +1,3 @@
-TOP     := ..
-NAME    := amazonka-core
-VERSION := $(shell sed -n 's/^version: *\(.*\)$$/\1/p' amazonka-core.cabal)
+NAME := amazonka-core
 
-include $(TOP)/share/library.mk
-
-.PHONY: test
-
-test: cabal.config.stripped
-	ln -fs $(CABAL_SANDBOX_CONFIG) cabal.sandbox.config && \
- cabal install --enable-tests --only-dep && \
- cabal configure --enable-tests && \
- cabal build && \
- cabal test
+include ../share/library.mk
diff --git a/share/examples.mk b/share/examples.mk