From: wansuyoo Date: Thu, 28 Mar 2019 11:58:56 +0000 (+0900) Subject: merge CMain build at build script X-Git-Tag: submit/tizen/20190409.085658~9^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=806e5fc6c1f3a56d490f239baf86ad40773b7171;p=platform%2Fcore%2Fsystem%2Fedge-orchestration.git merge CMain build at build script --- diff --git a/.vscode/ipch/41f94ecade7ac355/dbus_interface.ipch b/.vscode/ipch/41f94ecade7ac355/dbus_interface.ipch new file mode 100644 index 0000000..eb49783 Binary files /dev/null and b/.vscode/ipch/41f94ecade7ac355/dbus_interface.ipch differ diff --git a/.vscode/ipch/41f94ecade7ac355/mmap_address.bin b/.vscode/ipch/41f94ecade7ac355/mmap_address.bin new file mode 100644 index 0000000..65b56f2 Binary files /dev/null and b/.vscode/ipch/41f94ecade7ac355/mmap_address.bin differ diff --git a/.vscode/ipch/44a638f11caf1a5a/main.ipch b/.vscode/ipch/44a638f11caf1a5a/main.ipch new file mode 100644 index 0000000..c7624e2 Binary files /dev/null and b/.vscode/ipch/44a638f11caf1a5a/main.ipch differ diff --git a/.vscode/ipch/44a638f11caf1a5a/mmap_address.bin b/.vscode/ipch/44a638f11caf1a5a/mmap_address.bin new file mode 100644 index 0000000..c696783 Binary files /dev/null and b/.vscode/ipch/44a638f11caf1a5a/mmap_address.bin differ diff --git a/.vscode/ipch/9f3df889ea87a3f5/.ipch b/.vscode/ipch/9f3df889ea87a3f5/.ipch new file mode 100644 index 0000000..d5c2ce5 Binary files /dev/null and b/.vscode/ipch/9f3df889ea87a3f5/.ipch differ diff --git a/.vscode/ipch/9f3df889ea87a3f5/mmap_address.bin b/.vscode/ipch/9f3df889ea87a3f5/mmap_address.bin new file mode 100644 index 0000000..05ae6fb Binary files /dev/null and b/.vscode/ipch/9f3df889ea87a3f5/mmap_address.bin differ diff --git a/Makefile b/Makefile index 349cdfc..b423106 100644 --- a/Makefile +++ b/Makefile @@ -8,15 +8,21 @@ GOCOVER := gocov GO_LDFLAGS := -ldflags '-extldflags "-static"' # Target parameters +BIN_DIR := $(BASE_DIR)/bin BINARY_FILE := edge-orchestration -OBJECT_FILE := liborchestration.so -HEADER_FILE := orchestration.h EXEC_SRC_DIR := GoMain OBJ_SRC_DIR := interface -BIN_DIR := $(BASE_DIR)/bin -CMAIN_DIR := $(BASE_DIR)/src/CMain PKG_DIRS := devicemgr discoverymgr interface restapi/v1 servicemgr +# CMain target +HEADER_FILE_C := orchestration.h +OBJECT_FILE_C := liborchestration.so +CMAIN_DIR := $(BASE_DIR)/src/CMain +CMAIN_BIN_DIR := $(CMAIN_DIR)/bin + + + + .DEFAULT_GOAL := help ## test and build @@ -27,15 +33,11 @@ build-binary: $(GOBUILD) -a $(GO_LDFLAGS) -o $(BIN_DIR)/$(BINARY_FILE) $(EXEC_SRC_DIR) || exit 1 ls -al $(BIN_DIR) + $(MAKE) -C $(CMAIN_DIR) + ## edge-orchestration shared object build build-object: - CGO_ENABLED=1 $(GOBUILD) -o $(BIN_DIR)/$(OBJECT_FILE) -buildmode=c-shared -linkshared $(OBJ_SRC_DIR) || exit 1 - ls -al $(BIN_DIR) - - rm -f $(CMAIN_DIR)/$(OBJECT_FILE) - rm -f $(CMAIN_DIR)/$(HEADER_FILE) - cp $(BIN_DIR)/$(OBJECT_FILE) $(CMAIN_DIR) - cp $(BIN_DIR)/$(HEADER_FILE) $(CMAIN_DIR) + CGO_ENABLED=1 $(GOBUILD) -o $(CMAIN_DIR)/$(OBJECT_FILE_C) -buildmode=c-shared -linkshared $(OBJ_SRC_DIR) || exit 1 ## go test and coverage test: @@ -47,7 +49,9 @@ test: ## build clean clean: $(GOCLEAN) - rm -f $(BIN_DIR)/* + -rm -f $(CMAIN_DIR)/$(OBJECT_FILE_C) + -rm -f $(CMAIN_DIR)/$(HEADER_FILE_C) + -rm -f $(BIN_DIR)/* ## check go style and static analysis lint: diff --git a/build.sh b/build.sh index 447d2df..2fce3cc 100755 --- a/build.sh +++ b/build.sh @@ -72,10 +72,10 @@ then install_prerequisite build_clean build_test - build_binary build_object + build_binary lint_src_code - register_service + register_service else build_clean build_binary diff --git a/src/CMain/Makefile b/src/CMain/Makefile index 8afb089..0bff023 100644 --- a/src/CMain/Makefile +++ b/src/CMain/Makefile @@ -10,7 +10,7 @@ all: orchestration # lt; -o $@ orchestration: main.o dbus_interface.o - $(CC) -g -Wall -Werror ./src/main.o ./src/dbus_interface.o -o orchestration -I ./inc `pkg-config --libs --cflags gio-2.0 gio-unix-2.0 glib-2.0 dbus-glib-1 dbus-1` + $(CC) -g -Wall -Werror ./src/main.o ./src/dbus_interface.o -o ./bin/orchestration -I ./inc `pkg-config --libs --cflags gio-2.0 gio-unix-2.0 glib-2.0 dbus-glib-1 dbus-1` main.o: ./src/main.c $(CC) -Wall ./src/main.c -c -o ./src/main.o -I ./inc `pkg-config --libs --cflags glib-2.0` @@ -21,4 +21,4 @@ dbus_interface.o: ./src/dbus_interface.c .PHONY: clean clean: - rm ./src/*.o orchestration \ No newline at end of file + -rm ./src/*.o ./bin/orchestration \ No newline at end of file diff --git a/src/CMain/bin/orchestration b/src/CMain/bin/orchestration new file mode 100755 index 0000000..5596b8a Binary files /dev/null and b/src/CMain/bin/orchestration differ diff --git a/src/CMain/liborchestration.h b/src/CMain/liborchestration.h new file mode 100644 index 0000000..50bfb22 --- /dev/null +++ b/src/CMain/liborchestration.h @@ -0,0 +1,74 @@ +/* Code generated by cmd/cgo; DO NOT EDIT. */ + +/* package interface */ + + +#line 1 "cgo-builtin-prolog" + +#include /* for ptrdiff_t below */ + +#ifndef GO_CGO_EXPORT_PROLOGUE_H +#define GO_CGO_EXPORT_PROLOGUE_H + +typedef struct { const char *p; ptrdiff_t n; } _GoString_; + +#endif + +/* Start of preamble from import "C" comments. */ + + + + +/* End of preamble from import "C" comments. */ + + +/* Start of boilerplate cgo prologue. */ +#line 1 "cgo-gcc-export-header-prolog" + +#ifndef GO_CGO_PROLOGUE_H +#define GO_CGO_PROLOGUE_H + +typedef signed char GoInt8; +typedef unsigned char GoUint8; +typedef short GoInt16; +typedef unsigned short GoUint16; +typedef int GoInt32; +typedef unsigned int GoUint32; +typedef long long GoInt64; +typedef unsigned long long GoUint64; +typedef GoInt64 GoInt; +typedef GoUint64 GoUint; +typedef __SIZE_TYPE__ GoUintptr; +typedef float GoFloat32; +typedef double GoFloat64; +typedef float _Complex GoComplex64; +typedef double _Complex GoComplex128; + +/* + static assertion to make sure the file is being used on architecture + at least with matching size of GoInt. +*/ +typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1]; + +typedef _GoString_ GoString; +typedef void *GoMap; +typedef void *GoChan; +typedef struct { void *t; void *v; } GoInterface; +typedef struct { void *data; GoInt len; GoInt cap; } GoSlice; + +#endif + +/* End of boilerplate cgo prologue. */ + +#ifdef __cplusplus +extern "C" { +#endif + + +extern int OrchestrationInit(); + +extern int OrchestrationRequestService(); + +#ifdef __cplusplus +} +#endif diff --git a/src/CMain/orchestration.so b/src/CMain/orchestration.so deleted file mode 100644 index 45cf92f..0000000 Binary files a/src/CMain/orchestration.so and /dev/null differ diff --git a/src/CMain/src/dbus_interface.o b/src/CMain/src/dbus_interface.o new file mode 100644 index 0000000..ac2c757 Binary files /dev/null and b/src/CMain/src/dbus_interface.o differ diff --git a/src/CMain/src/main.o b/src/CMain/src/main.o new file mode 100644 index 0000000..8f3b085 Binary files /dev/null and b/src/CMain/src/main.o differ