fixed names

diff --git a/Makefile b/Makefile
index 3f556676e0854dc5a5d003a96c21096ac8249992..349cdfc7f4c150d578f527dc1e2fd7c4745a5644 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,12 @@ GO_LDFLAGS  := -ldflags '-extldflags "-static"'
 
 # Target parameters
 BINARY_FILE    := edge-orchestration
-OBJECT_FILE            := orchestration.so
+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/main-c
+CMAIN_DIR              := $(BASE_DIR)/src/CMain
 PKG_DIRS               := devicemgr discoverymgr interface restapi/v1 servicemgr
 
 .DEFAULT_GOAL := help
@@ -31,6 +31,9 @@ build-binary:
 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)
 

diff --git a/src/CMain/liborchestration.so b/src/CMain/liborchestration.so
new file mode 100644 (file)
index 0000000..45cf92f
Binary files /dev/null and b/src/CMain/liborchestration.so differ

diff --git a/src/CMain/orchestration.h b/src/CMain/orchestration.h
deleted file mode 100644 (file)
index 50bfb22..0000000
--- a/src/CMain/orchestration.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Code generated by cmd/cgo; DO NOT EDIT. */
-
-/* package interface */
-
-
-#line 1 "cgo-builtin-prolog"
-
-#include <stddef.h> /* 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/main-c b/src/main-c
deleted file mode 100644 (file)
index 50bfb22..0000000
--- a/src/main-c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Code generated by cmd/cgo; DO NOT EDIT. */
-
-/* package interface */
-
-
-#line 1 "cgo-builtin-prolog"
-
-#include <stddef.h> /* 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