fixed file name
authorwansuyoo <wansu.yoo@samsung.com>
Thu, 28 Mar 2019 12:06:16 +0000 (21:06 +0900)
committerwansuyoo <wansu.yoo@samsung.com>
Thu, 28 Mar 2019 12:06:16 +0000 (21:06 +0900)
.vscode/ipch/41f94ecade7ac355/dbus_interface.ipch [deleted file]
.vscode/ipch/41f94ecade7ac355/mmap_address.bin [deleted file]
.vscode/ipch/44a638f11caf1a5a/main.ipch [deleted file]
.vscode/ipch/44a638f11caf1a5a/mmap_address.bin [deleted file]
.vscode/ipch/9f3df889ea87a3f5/.ipch [deleted file]
.vscode/ipch/9f3df889ea87a3f5/mmap_address.bin [deleted file]
Makefile
src/CMain/inc/liborchestration.h [moved from src/CMain/liborchestration.h with 100% similarity]
src/CMain/inc/liborchestration.so [moved from src/CMain/liborchestration.so with 100% similarity]
src/CMain/inc/orchestration.h [deleted file]

diff --git a/.vscode/ipch/41f94ecade7ac355/dbus_interface.ipch b/.vscode/ipch/41f94ecade7ac355/dbus_interface.ipch
deleted file mode 100644 (file)
index eb49783..0000000
Binary files a/.vscode/ipch/41f94ecade7ac355/dbus_interface.ipch and /dev/null differ
diff --git a/.vscode/ipch/41f94ecade7ac355/mmap_address.bin b/.vscode/ipch/41f94ecade7ac355/mmap_address.bin
deleted file mode 100644 (file)
index 65b56f2..0000000
Binary files a/.vscode/ipch/41f94ecade7ac355/mmap_address.bin and /dev/null differ
diff --git a/.vscode/ipch/44a638f11caf1a5a/main.ipch b/.vscode/ipch/44a638f11caf1a5a/main.ipch
deleted file mode 100644 (file)
index c7624e2..0000000
Binary files a/.vscode/ipch/44a638f11caf1a5a/main.ipch and /dev/null differ
diff --git a/.vscode/ipch/44a638f11caf1a5a/mmap_address.bin b/.vscode/ipch/44a638f11caf1a5a/mmap_address.bin
deleted file mode 100644 (file)
index c696783..0000000
Binary files a/.vscode/ipch/44a638f11caf1a5a/mmap_address.bin and /dev/null differ
diff --git a/.vscode/ipch/9f3df889ea87a3f5/.ipch b/.vscode/ipch/9f3df889ea87a3f5/.ipch
deleted file mode 100644 (file)
index d5c2ce5..0000000
Binary files a/.vscode/ipch/9f3df889ea87a3f5/.ipch and /dev/null differ
diff --git a/.vscode/ipch/9f3df889ea87a3f5/mmap_address.bin b/.vscode/ipch/9f3df889ea87a3f5/mmap_address.bin
deleted file mode 100644 (file)
index 05ae6fb..0000000
Binary files a/.vscode/ipch/9f3df889ea87a3f5/mmap_address.bin and /dev/null differ
index b423106..105324c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,10 @@ OBJ_SRC_DIR          := interface
 PKG_DIRS               := devicemgr discoverymgr interface restapi/v1 servicemgr
 
 # CMain target
-HEADER_FILE_C  := orchestration.h
+HEADER_FILE_C  := liborchestration.h
 OBJECT_FILE_C  := liborchestration.so
 CMAIN_DIR              := $(BASE_DIR)/src/CMain
+CMAIN_INC_DIR  := $(CMAIN_DIR)/inc
 CMAIN_BIN_DIR  := $(CMAIN_DIR)/bin
 
 
@@ -37,7 +38,7 @@ build-binary:
 
 ## edge-orchestration shared object build
 build-object:
-       CGO_ENABLED=1 $(GOBUILD) -o $(CMAIN_DIR)/$(OBJECT_FILE_C) -buildmode=c-shared -linkshared $(OBJ_SRC_DIR) || exit 1
+       CGO_ENABLED=1 $(GOBUILD) -o $(CMAIN_INC_DIR)/$(OBJECT_FILE_C) -buildmode=c-shared -linkshared $(OBJ_SRC_DIR) || exit 1
 
 ## go test and coverage
 test:
diff --git a/src/CMain/inc/orchestration.h b/src/CMain/inc/orchestration.h
deleted file mode 100644 (file)
index 50bfb22..0000000
+++ /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