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

Generated new protobuf-c direclty using Atomic Object fork to eliminate the... 

Generated new protobuf-c direclty using Atomic Object fork to eliminate the manual naming updates that were done post-generation to facilitate easier future updates to kinetic-protocol.
parent a0843035

Gemfile

+1 −1
Original line number Diff line number Diff line 
source "http://rubygems.org/"

gem 'bundler', '>= 1.3.5'

gem 'ceedling', '>= 0.16'
 
gem 'ceedling', '>= 0.18'

Gemfile.lock

+2 −2
Original line number Diff line number Diff line 
GEM

  remote: http://rubygems.org/

  specs:

    ceedling (0.16.0)

    ceedling (0.18.0)

      rake (>= 0.8.7)

      thor (>= 0.14.5)

    rake (10.4.2)
@@ -12,4 +12,4 @@ PLATFORMS 


DEPENDENCIES

  bundler (>= 1.3.5)

  ceedling (>= 0.16)
 
  ceedling (>= 0.18)

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ LIB_OBJS = \ 
	$(OUT_DIR)/kinetic_bus.o \

	$(OUT_DIR)/kinetic_auth.o \

	$(OUT_DIR)/kinetic_pdu_unpack.o \

	$(OUT_DIR)/kinetic_proto.o \

	$(OUT_DIR)/kinetic.pb-c.o \

	$(OUT_DIR)/kinetic_socket.o \

	$(OUT_DIR)/kinetic_message.o \

	$(OUT_DIR)/kinetic_logger.o \
@@ -310,7 +310,7 @@ uninstall: 
	$(RM) -f $(PREFIX)/include/kinetic_types.h

	$(RM) -f $(PREFIX)/include/kinetic_semaphore.h

	$(RM) -f $(PREFIX)/include/byte_array.h

	$(RM) -f $(PREFIX)/include/kinetic_proto.h

	$(RM) -f $(PREFIX)/include/kinetic.pb-c.h

	$(RM) -f $(PREFIX)/include/protobuf-c/protobuf-c.h

	$(RM) -f $(PREFIX)/include/protobuf-c.h

	if [ -f ${JSONC}/Makefile ]; then cd ${JSONC} && make uninstall; fi;

kinetic-c.sublime-project

+8 −8
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
	[

		{

			"cmd": "make",

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"file_regex": "([A-Za-z][A-Za-z0-9/_\\-\\.]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Default Build",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
@@ -14,7 +14,7 @@ 
				"make",

				"test"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"file_regex": "([A-Za-z][A-Za-z0-9/_\\-\\.]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Run all tests (full)",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
@@ -26,7 +26,7 @@ 
				"CC=gcc-4.8",

				"test:${file_name}"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"file_regex": "([A-Za-z][A-Za-z0-9/_\\-\\.]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Test current module",

			"selector":

			[
@@ -42,7 +42,7 @@ 
				"make",

				"${file_base_name}"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"file_regex": "([A-Za-z][A-Za-z0-9/_\\-\\.]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Build and run system test",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
@@ -53,7 +53,7 @@ 
				"make",

				"utility"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"file_regex": "([A-Za-z][A-Za-z0-9/_\\-\\.]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Build test utility",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
@@ -64,7 +64,7 @@ 
				"make",

				"run"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"file_regex": "([A-Za-z][A-Za-z0-9/_\\-\\.]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Build and run test utility",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
@@ -75,7 +75,7 @@ 
				"make",

				"examples"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"file_regex": "([A-Za-z][A-Za-z0-9/_\\-\\.]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Build and run examples",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
@@ -86,7 +86,7 @@ 
				"make",

				"all"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"file_regex": "([A-Za-z][A-Za-z0-9/_\\-\\.]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Full CI build",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",

scripts/generate_version_info.rb

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
kinetic_c_version = `cat config/VERSION`.strip

commit_hash = `git rev-parse HEAD`.strip

protocol_version = nil

File.readlines('src/lib/kinetic_proto.c').each do |l|

    m = l.match /^char KineticProto_local_protocol_version_default_value\[\]\s+=\s+\"(.*)\"/

File.readlines('src/lib/kinetic.pb-c.c').each do |l|

    m = l.match /^char com_seagate_kinetic_proto_local_protocol_version_default_value\[\]\s+=\s+\"(.*)\"/

    if m

        protocol_version = m[1].strip

        break