Get rid of codelite crap.

Debug/main.cpp.o.d

@@ -8,7 +8,7 @@ Debug/main.cpp.o: main.cpp ../ServerCore/includes ../ServerCore/EPoll.h \
  ../ServerCore/TCPServer.h ../ServerCore/IPAddressList.h \
  ../ServerCore/CommandList.h ../ServerCore/EPoll.h \
  ../CoreUtils/Exception.h ../CoreUtils/File.h ../ServerCore/IPAddress.h \
- HTTPServer.h HTTPService.h HTTPSessions.h HTTPRequest.h \
+ HTTPServer.h ../ServerCore/TCPServer.h HTTPSessions.h HTTPRequest.h \
  ../CoreUtils/PString.h ../CoreUtils/IMFMessage.h ../CoreUtils/PString.h \
  ../CoreUtils/IMFHeader.h ../CoreUtils/IMFRequest.h \
  ../CoreUtils/IMFBody.h ../CoreUtils/IMFRequest.h \
@@ -18,7 +18,7 @@ Debug/main.cpp.o: main.cpp ../ServerCore/includes ../ServerCore/EPoll.h \
  __editview.h __style.h __setupadmin.h __favicon_ico.h __welcome.h \
  ../BMAMySQL/BMAMySQL.h __mainmenu.h __newview.h __configure.h \
  __viewlist.h ../CoreUtils/Directory.h ../CoreUtils/DirectoryEntry.h \
- HTTPHandler.h ../ServerCore/TCPServer.h
+ HTTPHandler.h
 
 ../ServerCore/includes:
 
@@ -70,7 +70,7 @@ Debug/main.cpp.o: main.cpp ../ServerCore/includes ../ServerCore/EPoll.h \
 
 HTTPServer.h:
 
-HTTPService.h:
+../ServerCore/TCPServer.h:
 
 HTTPSessions.h:
 
@@ -135,5 +135,3 @@ __viewlist.h:
 ../CoreUtils/DirectoryEntry.h:
 
 HTTPHandler.h:
-
-../ServerCore/TCPServer.h:

HTTPServer.mk

@@ -1,142 +0,0 @@
-##
-## Auto Generated makefile by CodeLite IDE
-## any manual changes will be erased      
-##
-## Debug
-ProjectName            :=HTTPServer
-ConfigurationName      :=Debug
-WorkspacePath          :=/home/bradarant/barant
-ProjectPath            :=/home/bradarant/barant/HTTPServer
-IntermediateDirectory  :=./Debug
-OutDir                 := $(IntermediateDirectory)
-CurrentFileName        :=
-CurrentFilePath        :=
-CurrentFileFullPath    :=
-User                   :=Brad Arant
-Date                   :=18/09/19
-CodeLitePath           :=/home/bradarant/.codelite
-LinkerName             :=/usr/bin/x86_64-linux-gnu-g++
-SharedObjectLinkerName :=/usr/bin/x86_64-linux-gnu-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             :=$(IntermediateDirectory)/$(ProjectName)
-Preprocessors          :=
-ObjectSwitch           :=-o 
-ArchiveOutputSwitch    := 
-PreprocessOnlySwitch   :=-E
-ObjectsFileList        :="HTTPServer.txt"
-PCHCompileFlags        :=
-MakeDirCommand         :=mkdir -p
-LinkOptions            :=  
-IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch). $(IncludeSwitch)../ServerCore/ $(IncludeSwitch)../CoreUtils $(IncludeSwitch)../JET $(IncludeSwitch)../BMAMySQL 
-IncludePCH             := 
-RcIncludePath          := 
-Libs                   := $(LibrarySwitch)ServerCore $(LibrarySwitch)CoreUtils $(LibrarySwitch)pthread $(LibrarySwitch)uuid $(LibrarySwitch)BMAMySQL $(LibrarySwitch)mysqlclient 
-ArLibs                 :=  "ServerCore" "CoreUtils" "pthread" "uuid" "BMAMySQL" "libmysqlclient" 
-LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)../ServerCore/Debug/ $(LibraryPathSwitch)../CoreUtils/Debug $(LibraryPathSwitch)../BMAMySQL/Debug 
-
-##
-## Common variables
-## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables
-##
-AR       := /usr/bin/x86_64-linux-gnu-ar rcu
-CXX      := /usr/bin/x86_64-linux-gnu-g++
-CC       := /usr/bin/x86_64-linux-gnu-gcc
-CXXFLAGS :=  -g -O0 -Wall $(Preprocessors)
-CFLAGS   :=  -g -O0 -Wall $(Preprocessors)
-ASFLAGS  := 
-AS       := /usr/bin/x86_64-linux-gnu-as
-
-
-##
-## User defined environment variables
-##
-CodeLiteDir:=/usr/share/codelite
-Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/HTTPSession.cpp$(ObjectSuffix) $(IntermediateDirectory)/HTTPSessions.cpp$(ObjectSuffix) $(IntermediateDirectory)/HTTPHandler.cpp$(ObjectSuffix) $(IntermediateDirectory)/HTTPPageList.cpp$(ObjectSuffix) 
-
-
-
-Objects=$(Objects0) 
-
-##
-## Main Build Targets 
-##
-.PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs
-all: $(OutputFile)
-
-$(OutputFile): $(IntermediateDirectory)/.d $(Objects) 
-	@$(MakeDirCommand) $(@D)
-	@echo "" > $(IntermediateDirectory)/.d
-	@echo $(Objects0)  > $(ObjectsFileList)
-	$(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)
-
-MakeIntermediateDirs:
-	@test -d ./Debug || $(MakeDirCommand) ./Debug
-
-
-$(IntermediateDirectory)/.d:
-	@test -d ./Debug || $(MakeDirCommand) ./Debug
-
-PreBuild:
-
-
-##
-## Objects
-##
-$(IntermediateDirectory)/main.cpp$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/HTTPServer/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/main.cpp$(DependSuffix): main.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/main.cpp$(DependSuffix) -MM main.cpp
-
-$(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.cpp$(PreprocessSuffix) main.cpp
-
-$(IntermediateDirectory)/HTTPSession.cpp$(ObjectSuffix): HTTPSession.cpp $(IntermediateDirectory)/HTTPSession.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/HTTPServer/HTTPSession.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/HTTPSession.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/HTTPSession.cpp$(DependSuffix): HTTPSession.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/HTTPSession.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/HTTPSession.cpp$(DependSuffix) -MM HTTPSession.cpp
-
-$(IntermediateDirectory)/HTTPSession.cpp$(PreprocessSuffix): HTTPSession.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/HTTPSession.cpp$(PreprocessSuffix) HTTPSession.cpp
-
-$(IntermediateDirectory)/HTTPSessions.cpp$(ObjectSuffix): HTTPSessions.cpp $(IntermediateDirectory)/HTTPSessions.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/HTTPServer/HTTPSessions.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/HTTPSessions.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/HTTPSessions.cpp$(DependSuffix): HTTPSessions.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/HTTPSessions.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/HTTPSessions.cpp$(DependSuffix) -MM HTTPSessions.cpp
-
-$(IntermediateDirectory)/HTTPSessions.cpp$(PreprocessSuffix): HTTPSessions.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/HTTPSessions.cpp$(PreprocessSuffix) HTTPSessions.cpp
-
-$(IntermediateDirectory)/HTTPHandler.cpp$(ObjectSuffix): HTTPHandler.cpp $(IntermediateDirectory)/HTTPHandler.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/HTTPServer/HTTPHandler.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/HTTPHandler.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/HTTPHandler.cpp$(DependSuffix): HTTPHandler.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/HTTPHandler.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/HTTPHandler.cpp$(DependSuffix) -MM HTTPHandler.cpp
-
-$(IntermediateDirectory)/HTTPHandler.cpp$(PreprocessSuffix): HTTPHandler.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/HTTPHandler.cpp$(PreprocessSuffix) HTTPHandler.cpp
-
-$(IntermediateDirectory)/HTTPPageList.cpp$(ObjectSuffix): HTTPPageList.cpp $(IntermediateDirectory)/HTTPPageList.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/HTTPServer/HTTPPageList.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/HTTPPageList.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/HTTPPageList.cpp$(DependSuffix): HTTPPageList.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/HTTPPageList.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/HTTPPageList.cpp$(DependSuffix) -MM HTTPPageList.cpp
-
-$(IntermediateDirectory)/HTTPPageList.cpp$(PreprocessSuffix): HTTPPageList.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/HTTPPageList.cpp$(PreprocessSuffix) HTTPPageList.cpp
-
-
--include $(IntermediateDirectory)/*$(DependSuffix)
-##
-## Clean
-##
-clean:
-	$(RM) -r ./Debug/
-
-

HTTPServer.project

@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CodeLite_Project Name="HTTPServer" Version="10.0.0" InternalType="Console">
-  <Description/>
-  <Dependencies/>
-  <VirtualDirectory Name="src">
-    <File Name="main.cpp"/>
-    <File Name="HTTPSession.h"/>
-    <File Name="HTTPSession.cpp"/>
-    <File Name="HTTPSessions.h"/>
-    <File Name="HTTPSessions.cpp"/>
-    <File Name="HTTPHandler.cpp"/>
-    <File Name="HTTPHandler.h"/>
-    <File Name="__setupadmin.h"/>
-    <File Name="__index.h"/>
-    <File Name="__favicon_ico.h"/>
-    <File Name="HTTPPage.h"/>
-    <File Name="HTTPPageList.h"/>
-    <File Name="HTTPPageList.cpp"/>
-    <File Name="__welcome.h"/>
-    <File Name="__script.h"/>
-    <File Name="__style.h"/>
-    <File Name="__editview.h"/>
-    <File Name="__mainmenu.h"/>
-    <File Name="__newview.h"/>
-    <File Name="HTTPRequest.h"/>
-    <File Name="__configure.h"/>
-    <File Name="__viewlist.h"/>
-    <File Name="HTTPPageCache.h"/>
-    <File Name="HTTPServer.h"/>
-  </VirtualDirectory>
-  <Dependencies Name="Debug"/>
-  <Dependencies Name="Release"/>
-  <Settings Type="Executable">
-    <GlobalSettings>
-      <Compiler Options="" C_Options="" Assembler="">
-        <IncludePath Value="."/>
-      </Compiler>
-      <Linker Options="">
-        <LibraryPath Value="."/>
-      </Linker>
-      <ResourceCompiler Options=""/>
-    </GlobalSettings>
-    <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-g;-O0;-Wall" C_Options="-g;-O0;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
-        <IncludePath Value="."/>
-        <IncludePath Value="../ServerCore/"/>
-        <IncludePath Value="../CoreUtils"/>
-        <IncludePath Value="../JET"/>
-        <IncludePath Value="../BMAMySQL"/>
-      </Compiler>
-      <Linker Options="" Required="yes">
-        <LibraryPath Value="../ServerCore/Debug/"/>
-        <LibraryPath Value="../CoreUtils/Debug"/>
-        <LibraryPath Value="../BMAMySQL/Debug"/>
-        <Library Value="ServerCore"/>
-        <Library Value="CoreUtils"/>
-        <Library Value="pthread"/>
-        <Library Value="uuid"/>
-        <Library Value="BMAMySQL"/>
-        <Library Value="libmysqlclient"/>
-      </Linker>
-      <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
-      <BuildSystem Name="Default"/>
-      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
-        <![CDATA[]]>
-      </Environment>
-      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="../../../../usr/bin/gdb" IsExtended="no">
-        <DebuggerSearchPaths/>
-        <PostConnectCommands/>
-        <StartupCommands/>
-      </Debugger>
-      <PreBuild/>
-      <PostBuild/>
-      <CustomBuild Enabled="no">
-        <RebuildCommand/>
-        <CleanCommand/>
-        <BuildCommand/>
-        <PreprocessFileCommand/>
-        <SingleFileCommand/>
-        <MakefileGenerationCommand/>
-        <ThirdPartyToolName>None</ThirdPartyToolName>
-        <WorkingDirectory/>
-      </CustomBuild>
-      <AdditionalRules>
-        <CustomPostBuild/>
-        <CustomPreBuild/>
-      </AdditionalRules>
-      <Completion EnableCpp11="no" EnableCpp14="no">
-        <ClangCmpFlagsC/>
-        <ClangCmpFlags/>
-        <ClangPP/>
-        <SearchPaths/>
-      </Completion>
-    </Configuration>
-    <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-O2;-Wall" C_Options="-O2;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
-        <IncludePath Value="."/>
-        <IncludePath Value="../ServerCore"/>
-        <Preprocessor Value="NDEBUG"/>
-      </Compiler>
-      <Linker Options="" Required="yes">
-        <LibraryPath Value="../ServerCore/Debug"/>
-        <Library Value="ServerCore"/>
-        <Library Value="pthread"/>
-      </Linker>
-      <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
-      <BuildSystem Name="Default"/>
-      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
-        <![CDATA[]]>
-      </Environment>
-      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
-        <DebuggerSearchPaths/>
-        <PostConnectCommands/>
-        <StartupCommands/>
-      </Debugger>
-      <PreBuild/>
-      <PostBuild/>
-      <CustomBuild Enabled="no">
-        <RebuildCommand/>
-        <CleanCommand/>
-        <BuildCommand/>
-        <PreprocessFileCommand/>
-        <SingleFileCommand/>
-        <MakefileGenerationCommand/>
-        <ThirdPartyToolName>None</ThirdPartyToolName>
-        <WorkingDirectory/>
-      </CustomBuild>
-      <AdditionalRules>
-        <CustomPostBuild/>
-        <CustomPreBuild/>
-      </AdditionalRules>
-      <Completion EnableCpp11="no" EnableCpp14="no">
-        <ClangCmpFlagsC/>
-        <ClangCmpFlags/>
-        <ClangPP/>
-        <SearchPaths/>
-      </Completion>
-    </Configuration>
-  </Settings>
-</CodeLite_Project>

HTTPServer.txt

@@ -1 +0,0 @@
-./Debug/main.cpp.o ./Debug/HTTPSession.cpp.o ./Debug/HTTPSessions.cpp.o ./Debug/HTTPHandler.cpp.o ./Debug/HTTPPageList.cpp.o

HTTPSession.h

@@ -2,7 +2,7 @@
 #define __HTTPSession_h__
 
 #include "includes"
-#include "Variables.h"
+//#include "Variables.h"
 
 namespace http {
 

__welcome.h

@@ -2,7 +2,6 @@
 #define ____welcome_h__
 
 #include "HTTPPage.h"
-#include "BMAMySQL.h"
 
 namespace http {
 

compile

@@ -1,24 +1,25 @@
 #!/bin/bash
 
-#for file in *.cpp
+for file in *.cpp
-#do
+do
-#   filename="${file%.*}"
+   filename="${file%.*}"
-#   list="$list $filename.o"  
+   list="$list $filename.o"  
-#   echo -n "Compiling $filename..."
+   echo -n "Compiling $filename..."
-#   g++ -c $file -I../ServerCore
+   g++ -c -I../CoreUtils -I../ServerCore $file &
-#   if [ $? = '0' ]
+   if [ $? = '0' ]
-#   then
+   then
-#    echo "OK"
+    echo "OK"
-#   else
+   else
-#    echo "ERROR"
+    echo "ERROR"
-#    exit -1
+    exit -1
-#   fi   
+   fi   
    
 done
 
 wait
-echo -n "Building static library libServerCore.a..."
+echo -n "Building executable HTTPServer..."
-ar rcs libServerCore.a $list
+echo $list
+g++ -o HTTPServer -I../CoreUtils -I../ServerCore  -L../CoreUtils -L../ServerCore -lCoreUtils -lServerCore $list
 if [ $? = '0' ]
 then
  echo "OK"
@@ -27,5 +28,4 @@ else
  exit -1
 fi   
 
-rm *.o
+
-rm *~