Commit 172b25ec authored by Greg Williams's avatar Greg Williams
Browse files

Fixed #include case issue in kinetic.h (KineticAPI.h => KineticApi.h) to fix Linux/TravisCI. 

Disabled verbose output for :ci task.
Refactored release build path configuration.
Updated kinetic.h to use relative includes to specify includes using relative paths to simplify release/client builds.
Deleted repo-local copy of protobuf-c files in favor of pulling direct from kinetic-c subrepo.
parent 7709be9b

Rakefile

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ end 
desc "Run full CI build"

task :ci => [

  'clobber',

  'verbose',

  # 'verbose', # uncomment to enable verbose output for CI builds

  'all'

]

include/kinetic/kinetic.h

+5 −4
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ 
#ifndef KINETIC_C_CLIENT_KINETIC_H_

#define KINETIC_C_CLIENT_KINETIC_H_



#include "KineticTypes.h"

#include "KineticAPI.h"

#include "KineticProto.h"

#include "KineticConnection.h"

#include "../../src/lib/KineticTypes.h"

#include "../../src/lib/KineticApi.h"

#include "../../src/lib/KineticProto.h"

#include "../../src/lib/KineticConnection.h"

#include "../../src/vendor/protobuf-c/protobuf-c.h"



#endif /* KINETIC_C_CLIENT_KINETIC_H_ */

project.yml

+9 −3
Original line number Diff line number Diff line
@@ -26,11 +26,17 @@ 
  :test:

    - +:test/**

    - -:test/support

  :source:

    - src/**

    - include/**

    - src/**

  :support:

    - test/support

    - test/support/**

  :source:

    - src/lib/*

    - src/utility/*

    - vendor/protobuf-c/protobuf-c/*

  # Refactor release build once the Kinetic-C library is built, and link to it sepearately

  :release_toolchain_include:

    - include/**



:defines:

  # in order to add common defines:

src/vendor/protobuf-c/protobuf-c.c

deleted100644 → 0
+0 −3251

File deleted.

Preview size limit exceeded, changes collapsed.

src/vendor/protobuf-c/protobuf-c.h

deleted100644 → 0
+0 −1081

File deleted.

Preview size limit exceeded, changes collapsed.