Skip to content
This repository has been archived by the owner on Sep 28, 2022. It is now read-only.

Commit

Permalink
[KZL-489] Prefer Makefile to build package
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandrebouthinon committed Sep 27, 2018
1 parent b385277 commit 47417a2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
12 changes: 0 additions & 12 deletions .ci/package_build.sh

This file was deleted.

4 changes: 1 addition & 3 deletions .travis.yml
Expand Up @@ -28,7 +28,7 @@ install:
- pip install awscli --upgrade --user

before_deploy:
- sudo ./.ci/package_build.sh
- docker --run -it -v "$(pwd)":/mnt kuzzleio/sdk-cross:gcc make package

deploy:
provider: s3
Expand Down Expand Up @@ -59,8 +59,6 @@ matrix:
script:
# Build & Test
- docker run --rm -it --network ci_default --link kuzzle -v "$(pwd)":/mnt kuzzleio/sdk-cross:gcc bash -c "make && ./.ci/build_tests.sh && ./.ci/run_test.sh"
- ./.ci/package_build.sh
- aws cloudfront create-invalidation --distribution-id $AWS_CLOUDFRONT_DISTRIBUTION_ID --paths "/*"

# ---------------------------------------
# I386
Expand Down
13 changes: 12 additions & 1 deletion Makefile
Expand Up @@ -70,13 +70,24 @@ cpp: makedir update_submodule make_c_sdk $(CPPSDK)
cd $(ROOTOUTDIR) && ln -sr $(LIB_PREFIX)kuzzlesdk$(DYNLIB).$(VERSION) $(LIB_PREFIX)kuzzlesdk$(DYNLIB)
cd $(ROOTOUTDIR) && ln -sr $(LIB_PREFIX)kuzzlesdk$(STATICLIB).$(VERSION) $(LIB_PREFIX)kuzzlesdk$(STATICLIB)

package: $(ROOTOUTDIR)$(PATHSEP)$(LIB_PREFIX)kuzzlesdk$(DYNLIB).$(VERSION) $(ROOTOUTDIR)$(PATHSEP)$(LIB_PREFIX)kuzzlesdk$(STATICLIB).$(VERSION)
mkdir $(ROOTOUTDIR)$(PATHSEP)lib
mkdir $(ROOTOUTDIR)$(PATHSEP)include
cp -fr $(ROOT_DIR)$(PATHSEP)include$(PATHSEP)*.hpp $(ROOTOUTDIR)$(PATHSEP)include
cp $(ROOT_DIR)$(PATHSEP)sdk-c$(PATHSEP)include$(PATHSEP)kuzzlesdk.h $(ROOTOUTDIR)$(PATHSEP)include
cp $(ROOT_DIR)$(PATHSEP)sdk-c$(PATHSEP)include$(PATHSEP)sdk_wrappers_internal.h $(ROOTOUTDIR)$(PATHSEP)include
cp $(ROOTOUTDIR)$(PATHSEP)*.so $(ROOTOUTDIR)$(PATHSEP)lib
cp $(ROOTOUTDIR)$(PATHSEP)*.a $(ROOTOUTDIR)$(PATHSEP)lib
mkdir deploy && cd $(ROOTOUTDIR) && tar cfz ..$(PATHSEP)deploy$(PATHSEP)kuzzlesdk-cpp-$(ARCH)-$(VERSION).tar.gz lib include

clean:
cd sdk-c && make clean
ifeq ($(OS),Windows_NT)
$(RRM) $(ROOTOUTDIR)
$(RRM) src$(PATHSEP)*.o
$(RRM) $(ROOT_DIR)$(PATHSEP)deploy
else
$(RRM) $(ROOTOUTDIR) src/*.o
$(RRM) $(ROOTOUTDIR) src/*.o $(ROOT_DIR)$(PATHSEP)deploy
endif
.PHONY: all cpp core clean

Expand Down

0 comments on commit 47417a2

Please sign in to comment.