diff --git a/Makefile b/Makefile index ebf7efd..7cfad48 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ .PHONY: clean All All: - @echo "----------Building project:[ UOCContacts - Debug ]----------" + @echo "----------Building project:[ UOCContacts - Release ]----------" @cd "UOCContacts" && "$(MAKE)" -f "UOCContacts.mk" - @echo "----------Building project:[ UOC20211 - Debug ]----------" + @echo "----------Building project:[ UOC20211 - Release ]----------" @"$(MAKE)" -f "UOC20211.mk" clean: - @echo "----------Cleaning project:[ UOCContacts - Debug ]----------" + @echo "----------Cleaning project:[ UOCContacts - Release ]----------" @cd "UOCContacts" && "$(MAKE)" -f "UOCContacts.mk" clean - @echo "----------Cleaning project:[ UOC20211 - Debug ]----------" + @echo "----------Cleaning project:[ UOC20211 - Release ]----------" @"$(MAKE)" -f "UOC20211.mk" clean diff --git a/README.txt b/README.txt index fdfe185..8bd4db4 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ gsboeck@uoc.edu -Solà i Boeck, Guillem +Solà i Boeck , Guillem Fedora release 34 (Thirty Four) x86_64 gcc version 11.2.1 20210728 (Red Hat 11.2.1-1) (GCC) diff --git a/UOC20211.mk b/UOC20211.mk index 8e24d7f..1c77914 100644 --- a/UOC20211.mk +++ b/UOC20211.mk @@ -1,143 +1,133 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Debug -ProjectName :=UOC20211 -ConfigurationName :=Debug -WorkspacePath :=W:/Docencia/PP/20211/PR1/UOC20211 -ProjectPath :=W:/Docencia/PP/20211/PR1/UOC20211 -IntermediateDirectory :=./bin/Debug -OutDir := $(IntermediateDirectory) -CurrentFileName := -CurrentFilePath := -CurrentFileFullPath := -User :=xavie -Date :=11/10/2021 -CodeLitePath :="C:/Program Files/CodeLite" -LinkerName :=C:/TDM-GCC-64/bin/g++.exe -SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC -ObjectSuffix :=.o -DependSuffix :=.o.d -PreprocessSuffix :=.i -DebugSwitch :=-g -IncludeSwitch :=-I -LibrarySwitch :=-l -OutputSwitch :=-o -LibraryPathSwitch :=-L -PreprocessorSwitch :=-D -SourceSwitch :=-c -OutputFile :=./bin/$(ProjectName)d -Preprocessors := -ObjectSwitch :=-o -ArchiveOutputSwitch := -PreprocessOnlySwitch :=-E -ObjectsFileList :="UOC20211.txt" -PCHCompileFlags := -MakeDirCommand :=makedir -RcCmpOptions := -RcCompilerName :=C:/TDM-GCC-64/bin/windres.exe -LinkOptions := -IncludePath := $(IncludeSwitch). $(IncludeSwitch). $(IncludeSwitch)test/include $(IncludeSwitch)UOCContacts/include -IncludePCH := -RcIncludePath := -Libs := $(LibrarySwitch)UOCContactsd -ArLibs := "libUOCContactsd.a" -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)./lib - -## -## Common variables -## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables -## -AR := C:/TDM-GCC-64/bin/ar.exe rcu -CXX := C:/TDM-GCC-64/bin/g++.exe -CC := C:/TDM-GCC-64/bin/gcc.exe -CXXFLAGS := -g -O0 -Wall $(Preprocessors) -CFLAGS := -g -O0 -Wall $(Preprocessors) -ASFLAGS := -AS := C:/TDM-GCC-64/bin/as.exe - - -## -## User defined environment variables -## -CodeLiteDir:=C:\Program Files\CodeLite -Objects0=$(IntermediateDirectory)/src_main.c$(ObjectSuffix) $(IntermediateDirectory)/test_src_test_suite.c$(ObjectSuffix) $(IntermediateDirectory)/test_src_test.c$(ObjectSuffix) $(IntermediateDirectory)/test_src_test_pr1.c$(ObjectSuffix) - - - -Objects=$(Objects0) - -## -## Main Build Targets -## -.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs -all: $(OutputFile) - -$(OutputFile): $(IntermediateDirectory)/.d ".build-debug\UOCContacts" $(Objects) - @$(MakeDirCommand) $(@D) - @echo "" > $(IntermediateDirectory)/.d - @echo $(Objects0) > $(ObjectsFileList) - $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) - -".build-debug\UOCContacts": - @$(MakeDirCommand) ".build-debug" - @echo stam > ".build-debug\UOCContacts" - - - - -MakeIntermediateDirs: - @$(MakeDirCommand) "./bin/Debug" - - -$(IntermediateDirectory)/.d: - @$(MakeDirCommand) "./bin/Debug" - -PreBuild: - - -## -## Objects -## -$(IntermediateDirectory)/src_main.c$(ObjectSuffix): src/main.c $(IntermediateDirectory)/src_main.c$(DependSuffix) - $(CC) $(SourceSwitch) "W:/Docencia/PP/20211/PR1/UOC20211/src/main.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_main.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_main.c$(DependSuffix): src/main.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_main.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_main.c$(DependSuffix) -MM src/main.c - -$(IntermediateDirectory)/src_main.c$(PreprocessSuffix): src/main.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_main.c$(PreprocessSuffix) src/main.c - -$(IntermediateDirectory)/test_src_test_suite.c$(ObjectSuffix): test/src/test_suite.c $(IntermediateDirectory)/test_src_test_suite.c$(DependSuffix) - $(CC) $(SourceSwitch) "W:/Docencia/PP/20211/PR1/UOC20211/test/src/test_suite.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/test_src_test_suite.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/test_src_test_suite.c$(DependSuffix): test/src/test_suite.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/test_src_test_suite.c$(ObjectSuffix) -MF$(IntermediateDirectory)/test_src_test_suite.c$(DependSuffix) -MM test/src/test_suite.c - -$(IntermediateDirectory)/test_src_test_suite.c$(PreprocessSuffix): test/src/test_suite.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/test_src_test_suite.c$(PreprocessSuffix) test/src/test_suite.c - -$(IntermediateDirectory)/test_src_test.c$(ObjectSuffix): test/src/test.c $(IntermediateDirectory)/test_src_test.c$(DependSuffix) - $(CC) $(SourceSwitch) "W:/Docencia/PP/20211/PR1/UOC20211/test/src/test.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/test_src_test.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/test_src_test.c$(DependSuffix): test/src/test.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/test_src_test.c$(ObjectSuffix) -MF$(IntermediateDirectory)/test_src_test.c$(DependSuffix) -MM test/src/test.c - -$(IntermediateDirectory)/test_src_test.c$(PreprocessSuffix): test/src/test.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/test_src_test.c$(PreprocessSuffix) test/src/test.c - -$(IntermediateDirectory)/test_src_test_pr1.c$(ObjectSuffix): test/src/test_pr1.c $(IntermediateDirectory)/test_src_test_pr1.c$(DependSuffix) - $(CC) $(SourceSwitch) "W:/Docencia/PP/20211/PR1/UOC20211/test/src/test_pr1.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/test_src_test_pr1.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/test_src_test_pr1.c$(DependSuffix): test/src/test_pr1.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/test_src_test_pr1.c$(ObjectSuffix) -MF$(IntermediateDirectory)/test_src_test_pr1.c$(DependSuffix) -MM test/src/test_pr1.c - -$(IntermediateDirectory)/test_src_test_pr1.c$(PreprocessSuffix): test/src/test_pr1.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/test_src_test_pr1.c$(PreprocessSuffix) test/src/test_pr1.c - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) -r ./bin/Debug/ - - +## +## Auto Generated makefile by CodeLite IDE +## any manual changes will be erased +## +## Release +ProjectName :=UOC20211 +ConfigurationName :=Release +WorkspacePath :=/dades/git/UOC/PP/PR1/UOC20211 +ProjectPath :=/dades/git/UOC/PP/PR1/UOC20211 +IntermediateDirectory :=./bin/Release +OutDir := $(IntermediateDirectory) +CurrentFileName := +CurrentFilePath := +CurrentFileFullPath := +User :=Guillem +Date :=19/10/21 +CodeLitePath :=/home/guillem/.codelite +LinkerName :=/usr/bin/g++ +SharedObjectLinkerName :=/usr/bin/g++ -shared -fPIC +ObjectSuffix :=.o +DependSuffix :=.o.d +PreprocessSuffix :=.i +DebugSwitch :=-g +IncludeSwitch :=-I +LibrarySwitch :=-l +OutputSwitch :=-o +LibraryPathSwitch :=-L +PreprocessorSwitch :=-D +SourceSwitch :=-c +OutputFile :=./bin/$(ProjectName) +Preprocessors :=$(PreprocessorSwitch)NDEBUG +ObjectSwitch :=-o +ArchiveOutputSwitch := +PreprocessOnlySwitch :=-E +ObjectsFileList :="UOC20211.txt" +PCHCompileFlags := +MakeDirCommand :=mkdir -p +LinkOptions := +IncludePath := $(IncludeSwitch). $(IncludeSwitch). $(IncludeSwitch)test/include $(IncludeSwitch)UOCContacts/include +IncludePCH := +RcIncludePath := +Libs := $(LibrarySwitch)UOCContacts +ArLibs := "libUOCContacts.a" +LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)./lib + +## +## Common variables +## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables +## +AR := /usr/bin/ar rcu +CXX := /usr/bin/g++ +CC := /usr/bin/gcc +CXXFLAGS := -O2 -Wall $(Preprocessors) +CFLAGS := -O2 -Wall $(Preprocessors) +ASFLAGS := +AS := /usr/bin/as + + +## +## User defined environment variables +## +CodeLiteDir:=/usr/share/codelite +Objects0=$(IntermediateDirectory)/test_src_test.c$(ObjectSuffix) $(IntermediateDirectory)/test_src_test_suite.c$(ObjectSuffix) $(IntermediateDirectory)/test_src_test_pr1.c$(ObjectSuffix) $(IntermediateDirectory)/src_main.c$(ObjectSuffix) + + + +Objects=$(Objects0) + +## +## Main Build Targets +## +.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs +all: $(OutputFile) + +$(OutputFile): $(IntermediateDirectory)/.d ".build-release/UOCContacts" $(Objects) + @$(MakeDirCommand) $(@D) + @echo "" > $(IntermediateDirectory)/.d + @echo $(Objects0) > $(ObjectsFileList) + $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) + +".build-release/UOCContacts": + @$(MakeDirCommand) ".build-release" + @echo stam > ".build-release/UOCContacts" + + + + +MakeIntermediateDirs: + @test -d ./bin/Release || $(MakeDirCommand) ./bin/Release + + +$(IntermediateDirectory)/.d: + @test -d ./bin/Release || $(MakeDirCommand) ./bin/Release + +PreBuild: + + +## +## Objects +## +$(IntermediateDirectory)/test_src_test.c$(ObjectSuffix): test/src/test.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/test_src_test.c$(ObjectSuffix) -MF$(IntermediateDirectory)/test_src_test.c$(DependSuffix) -MM test/src/test.c + $(CC) $(SourceSwitch) "/dades/git/UOC/PP/PR1/UOC20211/test/src/test.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/test_src_test.c$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/test_src_test.c$(PreprocessSuffix): test/src/test.c + $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/test_src_test.c$(PreprocessSuffix) test/src/test.c + +$(IntermediateDirectory)/test_src_test_suite.c$(ObjectSuffix): test/src/test_suite.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/test_src_test_suite.c$(ObjectSuffix) -MF$(IntermediateDirectory)/test_src_test_suite.c$(DependSuffix) -MM test/src/test_suite.c + $(CC) $(SourceSwitch) "/dades/git/UOC/PP/PR1/UOC20211/test/src/test_suite.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/test_src_test_suite.c$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/test_src_test_suite.c$(PreprocessSuffix): test/src/test_suite.c + $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/test_src_test_suite.c$(PreprocessSuffix) test/src/test_suite.c + +$(IntermediateDirectory)/test_src_test_pr1.c$(ObjectSuffix): test/src/test_pr1.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/test_src_test_pr1.c$(ObjectSuffix) -MF$(IntermediateDirectory)/test_src_test_pr1.c$(DependSuffix) -MM test/src/test_pr1.c + $(CC) $(SourceSwitch) "/dades/git/UOC/PP/PR1/UOC20211/test/src/test_pr1.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/test_src_test_pr1.c$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/test_src_test_pr1.c$(PreprocessSuffix): test/src/test_pr1.c + $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/test_src_test_pr1.c$(PreprocessSuffix) test/src/test_pr1.c + +$(IntermediateDirectory)/src_main.c$(ObjectSuffix): src/main.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_main.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_main.c$(DependSuffix) -MM src/main.c + $(CC) $(SourceSwitch) "/dades/git/UOC/PP/PR1/UOC20211/src/main.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_main.c$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_main.c$(PreprocessSuffix): src/main.c + $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_main.c$(PreprocessSuffix) src/main.c + + +-include $(IntermediateDirectory)/*$(DependSuffix) +## +## Clean +## +clean: + $(RM) -r ./bin/Release/ + + diff --git a/UOC20211.project b/UOC20211.project index 0224a1f..8be74ee 100644 --- a/UOC20211.project +++ b/UOC20211.project @@ -1,5 +1,5 @@ - + diff --git a/UOC20211.txt b/UOC20211.txt index 4513f15..7d5be10 100644 --- a/UOC20211.txt +++ b/UOC20211.txt @@ -1 +1 @@ -./bin/Debug/src_main.c.o ./bin/Debug/test_src_test_suite.c.o ./bin/Debug/test_src_test.c.o ./bin/Debug/test_src_test_pr1.c.o +./bin/Release/test_src_test.c.o ./bin/Release/test_src_test_suite.c.o ./bin/Release/test_src_test_pr1.c.o ./bin/Release/src_main.c.o diff --git a/UOC20211.workspace b/UOC20211.workspace index 09ed98b..580deab 100644 --- a/UOC20211.workspace +++ b/UOC20211.workspace @@ -3,7 +3,7 @@ - + diff --git a/UOCContacts/UOCContacts.mk b/UOCContacts/UOCContacts.mk index 787095e..7976a8d 100644 --- a/UOCContacts/UOCContacts.mk +++ b/UOCContacts/UOCContacts.mk @@ -1,138 +1,128 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Debug -ProjectName :=UOCContacts -ConfigurationName :=Debug -WorkspacePath :=W:/Docencia/PP/20211/PR1/UOC20211 -ProjectPath :=W:/Docencia/PP/20211/PR1/UOC20211/UOCContacts -IntermediateDirectory :=../bin/Debug -OutDir := $(IntermediateDirectory) -CurrentFileName := -CurrentFilePath := -CurrentFileFullPath := -User :=xavie -Date :=11/10/2021 -CodeLitePath :="C:/Program Files/CodeLite" -LinkerName :=C:/TDM-GCC-64/bin/g++.exe -SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC -ObjectSuffix :=.o -DependSuffix :=.o.d -PreprocessSuffix :=.i -DebugSwitch :=-g -IncludeSwitch :=-I -LibrarySwitch :=-l -OutputSwitch :=-o -LibraryPathSwitch :=-L -PreprocessorSwitch :=-D -SourceSwitch :=-c -OutputFile :=../lib/lib$(ProjectName)d.a -Preprocessors := -ObjectSwitch :=-o -ArchiveOutputSwitch := -PreprocessOnlySwitch :=-E -ObjectsFileList :="UOCContacts.txt" -PCHCompileFlags := -MakeDirCommand :=makedir -RcCmpOptions := -RcCompilerName :=C:/TDM-GCC-64/bin/windres.exe -LinkOptions := -IncludePath := $(IncludeSwitch). $(IncludeSwitch). $(IncludeSwitch)include -IncludePCH := -RcIncludePath := -Libs := -ArLibs := -LibPath := $(LibraryPathSwitch). - -## -## Common variables -## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables -## -AR := C:/TDM-GCC-64/bin/ar.exe rcu -CXX := C:/TDM-GCC-64/bin/g++.exe -CC := C:/TDM-GCC-64/bin/gcc.exe -CXXFLAGS := -g $(Preprocessors) -CFLAGS := -g $(Preprocessors) -ASFLAGS := -AS := C:/TDM-GCC-64/bin/as.exe - - -## -## User defined environment variables -## -CodeLiteDir:=C:\Program Files\CodeLite -Objects0=$(IntermediateDirectory)/src_date.c$(ObjectSuffix) $(IntermediateDirectory)/src_person.c$(ObjectSuffix) $(IntermediateDirectory)/src_csv.c$(ObjectSuffix) $(IntermediateDirectory)/src_api.c$(ObjectSuffix) - - - -Objects=$(Objects0) - -## -## Main Build Targets -## -.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs -all: $(IntermediateDirectory) $(OutputFile) - -$(OutputFile): $(Objects) - @$(MakeDirCommand) $(@D) - @echo "" > $(IntermediateDirectory)/.d - @echo $(Objects0) > $(ObjectsFileList) - $(AR) $(ArchiveOutputSwitch)$(OutputFile) @$(ObjectsFileList) $(ArLibs) - @$(MakeDirCommand) "W:\Docencia\PP\20211\PR1\UOC20211/.build-debug" - @echo rebuilt > "W:\Docencia\PP\20211\PR1\UOC20211/.build-debug/UOCContacts" - -MakeIntermediateDirs: - @$(MakeDirCommand) "../bin/Debug" - - -../bin/Debug: - @$(MakeDirCommand) "../bin/Debug" - -PreBuild: - - -## -## Objects -## -$(IntermediateDirectory)/src_date.c$(ObjectSuffix): src/date.c $(IntermediateDirectory)/src_date.c$(DependSuffix) - $(CC) $(SourceSwitch) "W:/Docencia/PP/20211/PR1/UOC20211/UOCContacts/src/date.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_date.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_date.c$(DependSuffix): src/date.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_date.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_date.c$(DependSuffix) -MM src/date.c - -$(IntermediateDirectory)/src_date.c$(PreprocessSuffix): src/date.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_date.c$(PreprocessSuffix) src/date.c - -$(IntermediateDirectory)/src_person.c$(ObjectSuffix): src/person.c $(IntermediateDirectory)/src_person.c$(DependSuffix) - $(CC) $(SourceSwitch) "W:/Docencia/PP/20211/PR1/UOC20211/UOCContacts/src/person.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_person.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_person.c$(DependSuffix): src/person.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_person.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_person.c$(DependSuffix) -MM src/person.c - -$(IntermediateDirectory)/src_person.c$(PreprocessSuffix): src/person.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_person.c$(PreprocessSuffix) src/person.c - -$(IntermediateDirectory)/src_csv.c$(ObjectSuffix): src/csv.c $(IntermediateDirectory)/src_csv.c$(DependSuffix) - $(CC) $(SourceSwitch) "W:/Docencia/PP/20211/PR1/UOC20211/UOCContacts/src/csv.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_csv.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_csv.c$(DependSuffix): src/csv.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_csv.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_csv.c$(DependSuffix) -MM src/csv.c - -$(IntermediateDirectory)/src_csv.c$(PreprocessSuffix): src/csv.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_csv.c$(PreprocessSuffix) src/csv.c - -$(IntermediateDirectory)/src_api.c$(ObjectSuffix): src/api.c $(IntermediateDirectory)/src_api.c$(DependSuffix) - $(CC) $(SourceSwitch) "W:/Docencia/PP/20211/PR1/UOC20211/UOCContacts/src/api.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_api.c$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_api.c$(DependSuffix): src/api.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_api.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_api.c$(DependSuffix) -MM src/api.c - -$(IntermediateDirectory)/src_api.c$(PreprocessSuffix): src/api.c - $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_api.c$(PreprocessSuffix) src/api.c - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) -r ../bin/Debug/ - - +## +## Auto Generated makefile by CodeLite IDE +## any manual changes will be erased +## +## Release +ProjectName :=UOCContacts +ConfigurationName :=Release +WorkspacePath :=/dades/git/UOC/PP/PR1/UOC20211 +ProjectPath :=/dades/git/UOC/PP/PR1/UOC20211/UOCContacts +IntermediateDirectory :=../bin/Release +OutDir := $(IntermediateDirectory) +CurrentFileName := +CurrentFilePath := +CurrentFileFullPath := +User :=Guillem +Date :=19/10/21 +CodeLitePath :=/home/guillem/.codelite +LinkerName :=/usr/bin/g++ +SharedObjectLinkerName :=/usr/bin/g++ -shared -fPIC +ObjectSuffix :=.o +DependSuffix :=.o.d +PreprocessSuffix :=.i +DebugSwitch :=-g +IncludeSwitch :=-I +LibrarySwitch :=-l +OutputSwitch :=-o +LibraryPathSwitch :=-L +PreprocessorSwitch :=-D +SourceSwitch :=-c +OutputFile :=../lib/lib$(ProjectName).a +Preprocessors := +ObjectSwitch :=-o +ArchiveOutputSwitch := +PreprocessOnlySwitch :=-E +ObjectsFileList :="UOCContacts.txt" +PCHCompileFlags := +MakeDirCommand :=mkdir -p +LinkOptions := +IncludePath := $(IncludeSwitch). $(IncludeSwitch). $(IncludeSwitch)include +IncludePCH := +RcIncludePath := +Libs := +ArLibs := +LibPath := $(LibraryPathSwitch). + +## +## Common variables +## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables +## +AR := /usr/bin/ar rcu +CXX := /usr/bin/g++ +CC := /usr/bin/gcc +CXXFLAGS := $(Preprocessors) +CFLAGS := $(Preprocessors) +ASFLAGS := +AS := /usr/bin/as + + +## +## User defined environment variables +## +CodeLiteDir:=/usr/share/codelite +Objects0=$(IntermediateDirectory)/src_api.c$(ObjectSuffix) $(IntermediateDirectory)/src_person.c$(ObjectSuffix) $(IntermediateDirectory)/src_csv.c$(ObjectSuffix) $(IntermediateDirectory)/src_date.c$(ObjectSuffix) + + + +Objects=$(Objects0) + +## +## Main Build Targets +## +.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs +all: $(IntermediateDirectory) $(OutputFile) + +$(OutputFile): $(Objects) + @$(MakeDirCommand) $(@D) + @echo "" > $(IntermediateDirectory)/.d + @echo $(Objects0) > $(ObjectsFileList) + $(AR) $(ArchiveOutputSwitch)$(OutputFile) @$(ObjectsFileList) + @$(MakeDirCommand) "/dades/git/UOC/PP/PR1/UOC20211/.build-release" + @echo rebuilt > "/dades/git/UOC/PP/PR1/UOC20211/.build-release/UOCContacts" + +MakeIntermediateDirs: + @test -d ../bin/Release || $(MakeDirCommand) ../bin/Release + + +../bin/Release: + @test -d ../bin/Release || $(MakeDirCommand) ../bin/Release + +PreBuild: + + +## +## Objects +## +$(IntermediateDirectory)/src_api.c$(ObjectSuffix): src/api.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_api.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_api.c$(DependSuffix) -MM src/api.c + $(CC) $(SourceSwitch) "/dades/git/UOC/PP/PR1/UOC20211/UOCContacts/src/api.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_api.c$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_api.c$(PreprocessSuffix): src/api.c + $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_api.c$(PreprocessSuffix) src/api.c + +$(IntermediateDirectory)/src_person.c$(ObjectSuffix): src/person.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_person.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_person.c$(DependSuffix) -MM src/person.c + $(CC) $(SourceSwitch) "/dades/git/UOC/PP/PR1/UOC20211/UOCContacts/src/person.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_person.c$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_person.c$(PreprocessSuffix): src/person.c + $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_person.c$(PreprocessSuffix) src/person.c + +$(IntermediateDirectory)/src_csv.c$(ObjectSuffix): src/csv.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_csv.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_csv.c$(DependSuffix) -MM src/csv.c + $(CC) $(SourceSwitch) "/dades/git/UOC/PP/PR1/UOC20211/UOCContacts/src/csv.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_csv.c$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_csv.c$(PreprocessSuffix): src/csv.c + $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_csv.c$(PreprocessSuffix) src/csv.c + +$(IntermediateDirectory)/src_date.c$(ObjectSuffix): src/date.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_date.c$(ObjectSuffix) -MF$(IntermediateDirectory)/src_date.c$(DependSuffix) -MM src/date.c + $(CC) $(SourceSwitch) "/dades/git/UOC/PP/PR1/UOC20211/UOCContacts/src/date.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_date.c$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_date.c$(PreprocessSuffix): src/date.c + $(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_date.c$(PreprocessSuffix) src/date.c + + +-include $(IntermediateDirectory)/*$(DependSuffix) +## +## Clean +## +clean: + $(RM) -r ../bin/Release/ + + diff --git a/UOCContacts/UOCContacts.project b/UOCContacts/UOCContacts.project index 6f9dd1c..2da226f 100644 --- a/UOCContacts/UOCContacts.project +++ b/UOCContacts/UOCContacts.project @@ -1,5 +1,5 @@ - + @@ -82,6 +82,7 @@ + diff --git a/UOCContacts/UOCContacts.txt b/UOCContacts/UOCContacts.txt index fa50bf1..0c84660 100644 --- a/UOCContacts/UOCContacts.txt +++ b/UOCContacts/UOCContacts.txt @@ -1 +1 @@ -../bin/Debug/src_date.c.o ../bin/Debug/src_person.c.o ../bin/Debug/src_csv.c.o ../bin/Debug/src_api.c.o +../bin/Release/src_api.c.o ../bin/Release/src_person.c.o ../bin/Release/src_csv.c.o ../bin/Release/src_date.c.o diff --git a/UOCContacts/compile_flags.txt b/UOCContacts/compile_flags.txt new file mode 100644 index 0000000..cc14ccc --- /dev/null +++ b/UOCContacts/compile_flags.txt @@ -0,0 +1,8 @@ +-I/usr/include/c++/11 +-I/usr/include/c++/11/x86_64-redhat-linux +-I/usr/include/c++/11/backward +-I/usr/lib/gcc/x86_64-redhat-linux/11/include +-I/usr/local/include +-I/usr/include +-I/dades/git/UOC/PP/PR1/UOC20211/UOCContacts +-I/dades/git/UOC/PP/PR1/UOC20211/UOCContacts/include diff --git a/bin/Debug/.d b/bin/Debug/.d new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/bin/Debug/.d @@ -0,0 +1 @@ + diff --git a/bin/Debug/src_api.c.o b/bin/Debug/src_api.c.o new file mode 100644 index 0000000..2d2fbae Binary files /dev/null and b/bin/Debug/src_api.c.o differ diff --git a/bin/Debug/src_api.c.o.d b/bin/Debug/src_api.c.o.d new file mode 100644 index 0000000..13e5619 --- /dev/null +++ b/bin/Debug/src_api.c.o.d @@ -0,0 +1,6 @@ +../bin/Debug/src_api.c.o: src/api.c include/csv.h include/api.h \ + include/error.h include/csv.h +include/csv.h: +include/api.h: +include/error.h: +include/csv.h: diff --git a/bin/Debug/src_csv.c.o b/bin/Debug/src_csv.c.o new file mode 100644 index 0000000..5575bae Binary files /dev/null and b/bin/Debug/src_csv.c.o differ diff --git a/bin/Debug/src_csv.c.o.d b/bin/Debug/src_csv.c.o.d new file mode 100644 index 0000000..2bc5680 --- /dev/null +++ b/bin/Debug/src_csv.c.o.d @@ -0,0 +1,2 @@ +../bin/Debug/src_csv.c.o: src/csv.c include/csv.h +include/csv.h: diff --git a/bin/Debug/src_date.c.o b/bin/Debug/src_date.c.o new file mode 100644 index 0000000..f2156e6 Binary files /dev/null and b/bin/Debug/src_date.c.o differ diff --git a/bin/Debug/src_date.c.o.d b/bin/Debug/src_date.c.o.d new file mode 100644 index 0000000..07d1183 --- /dev/null +++ b/bin/Debug/src_date.c.o.d @@ -0,0 +1,2 @@ +../bin/Debug/src_date.c.o: src/date.c include/date.h +include/date.h: diff --git a/bin/Debug/src_main.c.o b/bin/Debug/src_main.c.o new file mode 100644 index 0000000..27364d2 Binary files /dev/null and b/bin/Debug/src_main.c.o differ diff --git a/bin/Debug/src_main.c.o.d b/bin/Debug/src_main.c.o.d new file mode 100644 index 0000000..eef0845 --- /dev/null +++ b/bin/Debug/src_main.c.o.d @@ -0,0 +1,8 @@ +bin/Debug/src_main.c.o: src/main.c test/include/test.h \ + test/include/test_suite.h UOCContacts/include/api.h \ + UOCContacts/include/error.h UOCContacts/include/csv.h +test/include/test.h: +test/include/test_suite.h: +UOCContacts/include/api.h: +UOCContacts/include/error.h: +UOCContacts/include/csv.h: diff --git a/bin/Debug/src_person.c.o b/bin/Debug/src_person.c.o new file mode 100644 index 0000000..32b2bb7 Binary files /dev/null and b/bin/Debug/src_person.c.o differ diff --git a/bin/Debug/src_person.c.o.d b/bin/Debug/src_person.c.o.d new file mode 100644 index 0000000..ec4c249 --- /dev/null +++ b/bin/Debug/src_person.c.o.d @@ -0,0 +1,5 @@ +../bin/Debug/src_person.c.o: src/person.c include/person.h include/csv.h \ + include/date.h +include/person.h: +include/csv.h: +include/date.h: diff --git a/bin/Debug/test_src_test.c.o b/bin/Debug/test_src_test.c.o new file mode 100644 index 0000000..36ed392 Binary files /dev/null and b/bin/Debug/test_src_test.c.o differ diff --git a/bin/Debug/test_src_test.c.o.d b/bin/Debug/test_src_test.c.o.d new file mode 100644 index 0000000..02196d4 --- /dev/null +++ b/bin/Debug/test_src_test.c.o.d @@ -0,0 +1,5 @@ +bin/Debug/test_src_test.c.o: test/src/test.c test/include/test.h \ + test/include/test_suite.h test/include/test_pr1.h +test/include/test.h: +test/include/test_suite.h: +test/include/test_pr1.h: diff --git a/bin/Debug/test_src_test_pr1.c.o b/bin/Debug/test_src_test_pr1.c.o new file mode 100644 index 0000000..589ecf8 Binary files /dev/null and b/bin/Debug/test_src_test_pr1.c.o differ diff --git a/bin/Debug/test_src_test_pr1.c.o.d b/bin/Debug/test_src_test_pr1.c.o.d new file mode 100644 index 0000000..e42c318 --- /dev/null +++ b/bin/Debug/test_src_test_pr1.c.o.d @@ -0,0 +1,9 @@ +bin/Debug/test_src_test_pr1.c.o: test/src/test_pr1.c \ + test/include/test_pr1.h test/include/test_suite.h \ + UOCContacts/include/api.h UOCContacts/include/error.h \ + UOCContacts/include/csv.h +test/include/test_pr1.h: +test/include/test_suite.h: +UOCContacts/include/api.h: +UOCContacts/include/error.h: +UOCContacts/include/csv.h: diff --git a/bin/Debug/test_src_test_suite.c.o b/bin/Debug/test_src_test_suite.c.o new file mode 100644 index 0000000..ebec140 Binary files /dev/null and b/bin/Debug/test_src_test_suite.c.o differ diff --git a/bin/Debug/test_src_test_suite.c.o.d b/bin/Debug/test_src_test_suite.c.o.d new file mode 100644 index 0000000..a5489e0 --- /dev/null +++ b/bin/Debug/test_src_test_suite.c.o.d @@ -0,0 +1,3 @@ +bin/Debug/test_src_test_suite.c.o: test/src/test_suite.c \ + test/include/test_suite.h +test/include/test_suite.h: diff --git a/bin/Release/.d b/bin/Release/.d new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/bin/Release/.d @@ -0,0 +1 @@ + diff --git a/bin/Release/src_api.c.o b/bin/Release/src_api.c.o new file mode 100644 index 0000000..4ac313a Binary files /dev/null and b/bin/Release/src_api.c.o differ diff --git a/bin/Release/src_api.c.o.d b/bin/Release/src_api.c.o.d new file mode 100644 index 0000000..1ca69e7 --- /dev/null +++ b/bin/Release/src_api.c.o.d @@ -0,0 +1,6 @@ +../bin/Release/src_api.c.o: src/api.c include/csv.h include/api.h \ + include/error.h include/csv.h +include/csv.h: +include/api.h: +include/error.h: +include/csv.h: diff --git a/bin/Release/src_csv.c.o b/bin/Release/src_csv.c.o new file mode 100644 index 0000000..22fad5b Binary files /dev/null and b/bin/Release/src_csv.c.o differ diff --git a/bin/Release/src_csv.c.o.d b/bin/Release/src_csv.c.o.d new file mode 100644 index 0000000..b2507e7 --- /dev/null +++ b/bin/Release/src_csv.c.o.d @@ -0,0 +1,2 @@ +../bin/Release/src_csv.c.o: src/csv.c include/csv.h +include/csv.h: diff --git a/bin/Release/src_date.c.o b/bin/Release/src_date.c.o new file mode 100644 index 0000000..bb5d8f4 Binary files /dev/null and b/bin/Release/src_date.c.o differ diff --git a/bin/Release/src_date.c.o.d b/bin/Release/src_date.c.o.d new file mode 100644 index 0000000..a848f78 --- /dev/null +++ b/bin/Release/src_date.c.o.d @@ -0,0 +1,2 @@ +../bin/Release/src_date.c.o: src/date.c include/date.h +include/date.h: diff --git a/bin/Release/src_main.c.o b/bin/Release/src_main.c.o new file mode 100644 index 0000000..8b1e7f5 Binary files /dev/null and b/bin/Release/src_main.c.o differ diff --git a/bin/Release/src_main.c.o.d b/bin/Release/src_main.c.o.d new file mode 100644 index 0000000..fa1b7fa --- /dev/null +++ b/bin/Release/src_main.c.o.d @@ -0,0 +1,8 @@ +bin/Release/src_main.c.o: src/main.c test/include/test.h \ + test/include/test_suite.h UOCContacts/include/api.h \ + UOCContacts/include/error.h UOCContacts/include/csv.h +test/include/test.h: +test/include/test_suite.h: +UOCContacts/include/api.h: +UOCContacts/include/error.h: +UOCContacts/include/csv.h: diff --git a/bin/Release/src_person.c.o b/bin/Release/src_person.c.o new file mode 100644 index 0000000..f86735d Binary files /dev/null and b/bin/Release/src_person.c.o differ diff --git a/bin/Release/src_person.c.o.d b/bin/Release/src_person.c.o.d new file mode 100644 index 0000000..b3eb90b --- /dev/null +++ b/bin/Release/src_person.c.o.d @@ -0,0 +1,5 @@ +../bin/Release/src_person.c.o: src/person.c include/person.h \ + include/csv.h include/date.h +include/person.h: +include/csv.h: +include/date.h: diff --git a/bin/Release/test_src_test.c.o b/bin/Release/test_src_test.c.o new file mode 100644 index 0000000..837d3f9 Binary files /dev/null and b/bin/Release/test_src_test.c.o differ diff --git a/bin/Release/test_src_test.c.o.d b/bin/Release/test_src_test.c.o.d new file mode 100644 index 0000000..0102f12 --- /dev/null +++ b/bin/Release/test_src_test.c.o.d @@ -0,0 +1,5 @@ +bin/Release/test_src_test.c.o: test/src/test.c test/include/test.h \ + test/include/test_suite.h test/include/test_pr1.h +test/include/test.h: +test/include/test_suite.h: +test/include/test_pr1.h: diff --git a/bin/Release/test_src_test_pr1.c.o b/bin/Release/test_src_test_pr1.c.o new file mode 100644 index 0000000..6c2a910 Binary files /dev/null and b/bin/Release/test_src_test_pr1.c.o differ diff --git a/bin/Release/test_src_test_pr1.c.o.d b/bin/Release/test_src_test_pr1.c.o.d new file mode 100644 index 0000000..17db11d --- /dev/null +++ b/bin/Release/test_src_test_pr1.c.o.d @@ -0,0 +1,9 @@ +bin/Release/test_src_test_pr1.c.o: test/src/test_pr1.c \ + test/include/test_pr1.h test/include/test_suite.h \ + UOCContacts/include/api.h UOCContacts/include/error.h \ + UOCContacts/include/csv.h +test/include/test_pr1.h: +test/include/test_suite.h: +UOCContacts/include/api.h: +UOCContacts/include/error.h: +UOCContacts/include/csv.h: diff --git a/bin/Release/test_src_test_suite.c.o b/bin/Release/test_src_test_suite.c.o new file mode 100644 index 0000000..a38bf66 Binary files /dev/null and b/bin/Release/test_src_test_suite.c.o differ diff --git a/bin/Release/test_src_test_suite.c.o.d b/bin/Release/test_src_test_suite.c.o.d new file mode 100644 index 0000000..7f7b0ab --- /dev/null +++ b/bin/Release/test_src_test_suite.c.o.d @@ -0,0 +1,3 @@ +bin/Release/test_src_test_suite.c.o: test/src/test_suite.c \ + test/include/test_suite.h +test/include/test_suite.h: diff --git a/bin/UOC20211 b/bin/UOC20211 new file mode 100755 index 0000000..9553889 Binary files /dev/null and b/bin/UOC20211 differ diff --git a/bin/UOC20211d b/bin/UOC20211d new file mode 100755 index 0000000..62c5beb Binary files /dev/null and b/bin/UOC20211d differ diff --git a/bin/default_data.csv b/bin/default_data.csv new file mode 100644 index 0000000..f2af325 --- /dev/null +++ b/bin/default_data.csv @@ -0,0 +1,6 @@ +PERSON;87654321K;John;Smith;john.smith@example.com;My street, 25;08001;30/12/1980 +PERSON;98765432J;Jane;Doe;jane.doe@example.com;Her street, 5;08500;12/01/1995 +GEOLOCATION;87654321K;15/10/2021;13:41;41.3870;2.1698 +GEOLOCATION;87654321K;15/10/2021;13:45;41.3870;2.1695 +GEOLOCATION;98765432J;15/10/2021;13:50;41.3871;2.1697 +GEOLOCATION;87654321K;15/10/2021;13:50;41.3871;2.1697 diff --git a/compile_flags.txt b/compile_flags.txt new file mode 100644 index 0000000..acbe73e --- /dev/null +++ b/compile_flags.txt @@ -0,0 +1,10 @@ +-I/usr/include/c++/11 +-I/usr/include/c++/11/x86_64-redhat-linux +-I/usr/include/c++/11/backward +-I/usr/lib/gcc/x86_64-redhat-linux/11/include +-I/usr/local/include +-I/usr/include +-I/dades/git/UOC/PP/PR1/UOC20211 +-I/dades/git/UOC/PP/PR1/UOC20211/test/include +-I/dades/git/UOC/PP/PR1/UOC20211/UOCContacts/include +-DNDEBUG diff --git a/lib/libUOCContacts.a b/lib/libUOCContacts.a new file mode 100644 index 0000000..ae4685b Binary files /dev/null and b/lib/libUOCContacts.a differ diff --git a/lib/libUOCContactsd.a b/lib/libUOCContactsd.a new file mode 100644 index 0000000..68d237c Binary files /dev/null and b/lib/libUOCContactsd.a differ diff --git a/tags b/tags new file mode 100644 index 0000000..e69de29