[misc] update codelite project

klesh · May 22, 2017 · 43076f5 · 43076f5
1 parent 62bb396
commit 43076f5
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 28 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT(fu, 1.2.0, https://github.com/klesh/fu/issues)
+AC_INIT(fu, 1.3.1, https://github.com/klesh/fu/issues)
 AC_PROG_RANLIB
 AC_CONFIG_SRCDIR([fu/src/main.cpp])
 AM_CONFIG_HEADER([config.h])
@@ -96,6 +96,7 @@ AC_OUTPUT([Makefile \
            fu/src/protocols/imgur/Makefile \
            fu/src/protocols/local/Makefile \
            fu/src/protocols/sftp/Makefile \
+           fu/src/protocols/ftp/Makefile \
            fu/src/protocols/smms/Makefile \
            fu/src/ui/Makefile \
            fu/resources/Makefile

diff --git a/fu/fu.mk b/fu/fu.mk
@@ -2,18 +2,18 @@
 ## Auto Generated makefile by CodeLite IDE
 ## any manual changes will be erased      
 ##
-## Debug
+## Release
 ProjectName            :=fu
-ConfigurationName      :=Debug
+ConfigurationName      :=Release
 WorkspacePath          :=/home/klesh/Projects/Study/fu/fu
 ProjectPath            :=/home/klesh/Projects/Study/fu/fu
-IntermediateDirectory  :=./Debug
+IntermediateDirectory  :=./Release
 OutDir                 := $(IntermediateDirectory)
 CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=Klesh Wong
-Date                   :=08/05/17
+Date                   :=22/05/17
 CodeLitePath           :=/home/klesh/.codelite
 LinkerName             :=/usr/bin/g++
 SharedObjectLinkerName :=/usr/bin/g++ -shared -fPIC
@@ -28,14 +28,14 @@ LibraryPathSwitch      :=-L
 PreprocessorSwitch     :=-D
 SourceSwitch           :=-c 
 OutputFile             :=$(IntermediateDirectory)/$(ProjectName)
-Preprocessors          :=$(PreprocessorSwitch)__WXDEBUG__ $(PreprocessorSwitch)DEBUG $(PreprocessorSwitch)_DEBUG 
+Preprocessors          :=
 ObjectSwitch           :=-o 
 ArchiveOutputSwitch    := 
 PreprocessOnlySwitch   :=-E
 ObjectsFileList        :="fu.txt"
 PCHCompileFlags        :=
 MakeDirCommand         :=mkdir -p
-LinkOptions            :=  $(shell wx-config   --libs --unicode=yes) $(shell pkg-config --libs gtk+-2.0)
+LinkOptions            :=  -s $(shell wx-config --debug=no --libs --unicode=yes) $(shell pkg-config --libs gtk+-2.0)
 IncludePath            :=  $(IncludeSwitch). 
 IncludePCH             := 
 RcIncludePath          := 
@@ -50,8 +50,8 @@ LibPath                := $(LibraryPathSwitch).
 AR       := /usr/bin/ar rcu
 CXX      := /usr/bin/g++
 CC       := /usr/bin/gcc
-CXXFLAGS := -std=c++14 -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes  ) $(shell pkg-config --cflags gtk+-2.0) $(Preprocessors)
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes  ) $(shell pkg-config --cflags gtk+-2.0) $(Preprocessors)
+CXXFLAGS := -std=c++14 -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(shell pkg-config --cflags gtk+-2.0) $(Preprocessors)
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(shell pkg-config --cflags gtk+-2.0) $(Preprocessors)
 ASFLAGS  := 
 AS       := /usr/bin/as
 
@@ -62,8 +62,8 @@ AS       := /usr/bin/as
 CodeLiteDir:=/usr/share/codelite
 Objects0=$(IntermediateDirectory)/src_main.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_request.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_core_history.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_core_site.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_core_file.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_core_format.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_core_config.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_core_uploader.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_core_func.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_core_clip.cpp$(ObjectSuffix) \
 	$(IntermediateDirectory)/src_ui_prefform.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_ui_browseform.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_ui_tray.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_ui_preprocpanel.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_ui_sitespanel.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_ui_formatspanel.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_ui_sizerhelper.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_ui_common.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_ui_aboutform.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_os_linux.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/src_protocols_imgur_imgurp.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_imgur_imgur.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_imgur_imguros.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_local_localp.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_local_local.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_sftp_SftpWrapper.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_sftp_sftpos.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_sftp_sftpp.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_sftp_sftp.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/src_protocols_smms_smmsp.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_smms_smms.cpp$(ObjectSuffix) 
+	$(IntermediateDirectory)/src_protocols_imgur_imgurp.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_imgur_imgur.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_imgur_imguros.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_local_localp.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_local_local.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_sftp_SftpWrapper.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_sftp_sftpos.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_sftp_sftpp.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_sftp_sftp.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_smms_smmsp.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/src_protocols_smms_smms.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(ObjectSuffix) 
 
 
 
@@ -83,15 +83,15 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
 
 PostBuild:
 	@echo Executing Post Build commands ...
-	cp -R resources Debug/
+	cp -R resources Release/
 	@echo Done
 
 MakeIntermediateDirs:
-	@test -d ./Debug || $(MakeDirCommand) ./Debug
+	@test -d ./Release || $(MakeDirCommand) ./Release
 
 
 $(IntermediateDirectory)/.d:
-	@test -d ./Debug || $(MakeDirCommand) ./Debug
+	@test -d ./Release || $(MakeDirCommand) ./Release
 
 PreBuild:
 
@@ -283,14 +283,6 @@ $(IntermediateDirectory)/src_protocols_imgur_imguros.cpp$(DependSuffix): src/pro
 $(IntermediateDirectory)/src_protocols_imgur_imguros.cpp$(PreprocessSuffix): src/protocols/imgur/imguros.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_protocols_imgur_imguros.cpp$(PreprocessSuffix) src/protocols/imgur/imguros.cpp
 
-$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(ObjectSuffix): src/protocols/smms/smmsos.cpp $(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/klesh/Projects/Study/fu/fu/src/protocols/smms/smmsos.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(DependSuffix): src/protocols/smms/smmsos.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(DependSuffix) -MM src/protocols/smms/smmsos.cpp
-
-$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(PreprocessSuffix): src/protocols/smms/smmsos.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(PreprocessSuffix) src/protocols/smms/smmsos.cpp
-
 $(IntermediateDirectory)/src_protocols_local_localp.cpp$(ObjectSuffix): src/protocols/local/localp.cpp $(IntermediateDirectory)/src_protocols_local_localp.cpp$(DependSuffix)
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/klesh/Projects/Study/fu/fu/src/protocols/local/localp.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_protocols_local_localp.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/src_protocols_local_localp.cpp$(DependSuffix): src/protocols/local/localp.cpp
@@ -355,12 +347,20 @@ $(IntermediateDirectory)/src_protocols_smms_smms.cpp$(DependSuffix): src/protoco
 $(IntermediateDirectory)/src_protocols_smms_smms.cpp$(PreprocessSuffix): src/protocols/smms/smms.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_protocols_smms_smms.cpp$(PreprocessSuffix) src/protocols/smms/smms.cpp
 
+$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(ObjectSuffix): src/protocols/smms/smmsos.cpp $(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/klesh/Projects/Study/fu/fu/src/protocols/smms/smmsos.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(DependSuffix): src/protocols/smms/smmsos.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(DependSuffix) -MM src/protocols/smms/smmsos.cpp
+
+$(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(PreprocessSuffix): src/protocols/smms/smmsos.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_protocols_smms_smmsos.cpp$(PreprocessSuffix) src/protocols/smms/smmsos.cpp
+
 
 -include $(IntermediateDirectory)/*$(DependSuffix)
 ##
 ## Clean
 ##
 clean:
-	$(RM) -r ./Debug/
+	$(RM) -r ./Release/
 
 
diff --git a/fu/fu.project b/fu/fu.project
@@ -33,6 +33,11 @@
       <File Name="src/protocols/request.cpp"/>
       <File Name="src/protocols/ptcf.h"/>
       <File Name="src/protocols/ptc.h"/>
+      <VirtualDirectory Name="ftp">
+        <File Name="src/protocols/ftp/ftp.cpp"/>
+        <File Name="src/protocols/ftp/ftpos.cpp"/>
+        <File Name="src/protocols/ftp/ftpp.cpp"/>
+      </VirtualDirectory>
     </VirtualDirectory>
     <VirtualDirectory Name="core">
       <File Name="src/core/history.cpp"/>

diff --git a/fu/fu.workspace b/fu/fu.workspace
@@ -2,11 +2,11 @@
 <CodeLite_Workspace Name="fu" Database="" Version="10.0.0">
   <Project Name="fu" Path="fu.project" Active="Yes"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="yes">
+    <WorkspaceConfiguration Name="Debug" Selected="no">
       <Environment/>
       <Project Name="fu" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="no">
+    <WorkspaceConfiguration Name="Release" Selected="yes">
       <Environment/>
       <Project Name="fu" ConfigName="Release"/>
     </WorkspaceConfiguration>

diff --git a/fu/src/Makefile.am b/fu/src/Makefile.am
@@ -6,8 +6,8 @@ fu_LDADD = core/libcore.a \
 					 protocols/local/liblocal.a \
 					 protocols/sftp/libsftp.a \
 					 protocols/smms/libsmms.a \
-					 protocols/libprotocols.a \
 					 protocols/ftp/libftp.a \
+					 protocols/libprotocols.a \
 					 ui/libui.a
 fu_SOURCES = main.cpp
 fu_CPPFLAGS = -DICONS_PREFIX=\"$(ICONS_PREFIX)\"

diff --git a/fu/src/ui/Makefile.am b/fu/src/ui/Makefile.am
@@ -2,9 +2,9 @@ noinst_LIBRARIES = libui.a
 libui_a_SOURCES = browseform.cpp \
 									formatspanel.cpp \
 									prefform.cpp \
+									aboutform.cpp \
 									preprocpanel.cpp \
 									sitespanel.cpp \
 									sizerhelper.cpp \
-									tray.cpp \
-									about.cpp
+									tray.cpp
 libui_a_CPPFLAGS = -DICONS_PREFIX=\"$(ICONS_PREFIX)\"