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

Updated to Make/Rake builds to fix CI build

parent ff12c5fe

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ test_all: Rakefile $(LIB_OBJS) 
clean:

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



# all: uninstall clean test default install run rund

all: clean test_all default run



.PHONY: clean
@@ -204,8 +205,7 @@ uninstall: 
	${RM} -f ${PREFIX}/include/protobuf-c/protobuf-c.h

	${RM} -f ${PREFIX}/include/protobuf-c.h



# all: uninstall clean test default install run rund

ci: uninstall clean test_all default install run

make_ci: uninstall clean test_all default install run

	@echo

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

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

Rakefile

+6 −9
Original line number Diff line number Diff line
@@ -387,10 +387,6 @@ task :utility do 
  sh "make utility"

end



task :make_ci do

  sh "make ci"

end



desc "Test examples (test utility)"

task :run => ['utility'] do

  sh "make run"
@@ -412,11 +408,12 @@ task :all => [ 
]



desc "Run full CI build"

task :ci => [

  'clobber',

  'cppcheck',

  'make_ci'

]

task :ci => ['clobber', 'cppcheck', 'test_all'] do

  sh "sudo make uninstall"

  sh "make"

  sh "sudo make install"

  sh "make run"

end



task :default => [

  'test:delta',