Commit ff12c5fe authored by Greg Williams's avatar Greg Williams
Browse files

Added Eclipse project, corresponding Makefile updates, and updated CI build to follow suit.

parent 61563acd

.cproject

0 → 100644
+42 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

	<storageModule moduleId="org.eclipse.cdt.core.settings">

		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1040437110">

			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1040437110" moduleId="org.eclipse.cdt.core.settings" name="Default">

				<externalSettings/>

				<extensions>

					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>

				</extensions>

			</storageModule>

			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

				<configuration buildProperties="" id="cdt.managedbuild.toolchain.gnu.base.1040437110" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">

					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1040437110.676157085" name="/" resourcePath="">

						<toolChain id="cdt.managedbuild.toolchain.gnu.base.1102912325" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">

							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1375653953" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>

							<builder id="cdt.managedbuild.target.gnu.builder.base.378157306" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.target.gnu.builder.base"/>

							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1553883968" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>

							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.270562028" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"/>

							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.2040728617" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"/>

							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.290487872" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>

							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.2075997097" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"/>

							<tool id="cdt.managedbuild.tool.gnu.assembler.base.1916008336" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base"/>

						</toolChain>

					</folderInfo>

				</configuration>

			</storageModule>

			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

		</cconfiguration>

	</storageModule>

	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

		<project id="kinetic-c.null.633877458" name="kinetic-c"/>

	</storageModule>

	<storageModule moduleId="scannerConfiguration">

		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

	</storageModule>

	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

</cproject>

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ obj/ 
build/

docs/



# Eclipse temp files

.metadata/

RemoteSystemsTempFiles/



# Other local files to ignore

.tags*

*.sublime-workspace

.project

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>kinetic-c</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

			<triggers>clean,full,incremental,</triggers>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>

			<triggers>full,incremental,</triggers>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.eclipse.cdt.core.cnature</nature>

		<nature>org.eclipse.cdt.core.ccnature</nature>

		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>

		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

	</natures>

</projectDescription>

.settings/language.settings.xml

0 → 100644
+12 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<project>

	<configuration id="cdt.managedbuild.toolchain.gnu.base.1040437110" name="Default">

		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">

			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>

			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>

			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(gcc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>

			<provider-reference id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" ref="shared-provider"/>

			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>

		</extension>

	</configuration>

</project>

Makefile

+13 −9
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ PBC_INC = ./vendor/protobuf-c 
SOCKET99 = ./vendor/socket99

VND_INC = ./vendor

BIN = $(BIN_DIR)/kinetic_client

LDFLAGS += -lm -l crypto -l ssl

LDFLAGS += -lm -l ssl -l kinetic-c-client -l crypto



PREFIX ?= /usr/local

INSTALL ?= install
@@ -39,19 +39,22 @@ LIB_DEPS = $(PUB_INC)/kinetic_client.h $(PUB_INC)/kinetic_types.h $(LIB_DIR)/kin 
# LIB_OBJ = $(patsubst %,$(OUT_DIR)/%,$(LIB_OBJS))

LIB_OBJS = $(OUT_DIR)/kinetic_nbo.o $(OUT_DIR)/kinetic_operation.o $(OUT_DIR)/kinetic_pdu.o $(OUT_DIR)/kinetic_proto.o $(OUT_DIR)/kinetic_socket.o $(OUT_DIR)/kinetic_message.o $(OUT_DIR)/kinetic_logger.o $(OUT_DIR)/kinetic_hmac.o $(OUT_DIR)/kinetic_connection.o $(OUT_DIR)/kinetic_types.o $(OUT_DIR)/kinetic_client.o $(OUT_DIR)/socket99.o $(OUT_DIR)/protobuf-c.o



default: $(KINETIC_SO)

# default: $(KINETIC_SO)

default: $(KINETIC_LIB)



test: Rakefile $(LIB_OBJS)

test_all: Rakefile $(LIB_OBJS)

	@echo

	@echo --------------------------------------------------------------------------------

	@echo Testing $(PROJECT)

	@echo --------------------------------------------------------------------------------

	bundle install

	bundle exec rake ci

	bundle exec rake clobber test



clean:

	rm -rf $(BIN_DIR)/* $(OUT_DIR)/*.o *.core



all: clean test_all default run



.PHONY: clean



# $(OUT_DIR)/%.o: %.c $(DEPS)
@@ -102,7 +105,7 @@ $(KINETIC_SO): $(KINETIC_LIB) 
libso: $(KINETIC_SO)



UTIL_OBJS = $(OUT_DIR)/noop.o $(OUT_DIR)/put.o $(OUT_DIR)/get.o $(OUT_DIR)/delete.o

UTIL_INCS = -I/usr/local/include -I$(UTIL_DIR)

UTIL_INCS = -I./include -I/usr/local/include -I$(UTIL_DIR)



$(OUT_DIR)/noop.o: $(UTIL_EX)/noop.c

	$(CC) -c -o $@ $< $(CFLAGS) $(UTIL_INCS)
@@ -117,7 +120,7 @@ $(UTIL_EXEC): $(UTIL_DIR)/main.c $(UTIL_OBJS) 
	@echo --------------------------------------------------------------------------------

	@echo Building $(UTIL_EXEC) $(PROJECT) test utility \(statically linked\)

	@echo --------------------------------------------------------------------------------

	${CC} -o $@ $< $(UTIL_OBJS) $(UTIL_INCS) ${CFLAGS} -l $(PROJECT) ${LDFLAGS}

	${CC} -o $@ $< $(UTIL_OBJS) $(UTIL_INCS) ${CFLAGS} ${LDFLAGS}

$(UTIL_EXEC_DYN): $(UTIL_DIR)/main.c $(UTIL_OBJS)

	@echo

	@echo --------------------------------------------------------------------------------
@@ -166,7 +169,8 @@ rund: ${UTIL_EXEC_DYN} 
	exec pkill -f 'java.*kinetic-simulator'



# Installation

install: ${KINETIC_LIB} ${KINETIC_SO} VERSION

# Need to re-add ${KINETIC_SO}, once ready

install: ${KINETIC_LIB} VERSION

	@echo

	@echo --------------------------------------------------------------------------------

	@echo Installing $(PROJECT) v$(VERSION) into $(PREFIX)
@@ -201,10 +205,10 @@ uninstall: 
	${RM} -f ${PREFIX}/include/protobuf-c.h



# all: uninstall clean test default install run rund

all: uninstall clean test default install run

ci: uninstall clean test_all default install run

	@echo

	@echo --------------------------------------------------------------------------------

	@echo $(PROJECT) build completed successfully!

	@echo $(PROJECT) build w/ full regression tests completed successfully!

	@echo --------------------------------------------------------------------------------

	@echo $(PROJECT) v$(VERSION) is in working order

	@echo