Commit 4a624b66 authored by Greg Williams's avatar Greg Williams
Browse files

Merged in develop. Fixed path issues for Doxygen generation due to relocation... 

Merged in develop. Fixed path issues for Doxygen generation due to relocation of report output folder. Fixed missing doxy info in admin API.
parents d96e6a0b 343dc611

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
bin/

obj/

build/

docs/

docs/api/



# Eclipse temp files

.metadata/

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -350,10 +350,10 @@ systest_names = $(patsubst $(SYSTEST_OUT)/run_%,%,$(systest_executables)) 
list_system_tests:

	echo $(systest_names)



$(SYSTEST_OUT)/%_runner.c: $(SYSTEST_SRC)/%.c

$(SYSTEST_OUT)/%_runner.c: $(SYSTEST_SRC)/%.c $(KINETIC_LIB)

	./test/support/generate_test_runner.sh $< > $@



$(SYSTEST_OUT)/run_%: $(SYSTEST_SRC)/%.c $(SYSTEST_OUT)/%_runner.c $(KINETIC_LIB)

$(SYSTEST_OUT)/run_%: $(SYSTEST_SRC)/%.c $(SYSTEST_OUT)/%_runner.c

	@echo

	@echo ================================================================================

	@echo System test: '$<'

Rakefile

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ end 


namespace :doxygen do



  DOCS_PATH = "./docs/"

  DOCS_PATH = "./docs/api/"

  directory DOCS_PATH

  CLOBBER.include DOCS_PATH

  VERSION = File.read('./config/VERSION').strip

config/Doxyfile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ PROJECT_LOGO = ./config/images/seagate-logo-w-title-sm.png 
# entered, it will be relative to the location where doxygen was started. If

# left blank the current directory will be used.



OUTPUT_DIRECTORY       = ./docs

OUTPUT_DIRECTORY       = ./docs/api



# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-

# directories (in 2 levels) under the output directory of each output format and

docs/sequence_diagrams/msg_handling-no_errors.png

0 → 100644
+53.5 KiB
Loading image diff...