Skip to content

Commit

Permalink
Linux: generate a more standard deb packages using cmake (Part III)
Browse files Browse the repository at this point in the history
  • Loading branch information
Eran committed Sep 14, 2015
1 parent 2b2b08e commit a2b378b
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,12 @@ if ( MAKE_DEB )
set(CPACK_PACKAGE_NAME "CodeLite")
set(CPACK_PACKAGE_VERSION "8.2.5")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Eran Ifrah <[email protected]>") #required
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An open source, cross platform C/C++/PHP and Node.js IDE")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C/C++/PHP and Node.js IDE (Integrated Development Environment")
set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "build-essential, git, subversion, gdb, xterm, gcc, g++")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk2.0-dev, libssh-dev, libedit-dev, libhunspell-dev, libclang-3.5-dev, clang-format-3.5, liblldb-3.5-dev")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, libgtk2.0-dev, libssh-dev, libedit-dev, libhunspell-dev, libclang-3.5-dev, clang-format-3.5, liblldb-3.5-dev")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CL_SRC_ROOT}/DESC")
set(CPACK_STRIP_FILES TRUE)
INCLUDE(CPack)
endif( MAKE_DEB )
Expand Down
2 changes: 2 additions & 0 deletions DESC
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CodeLite is an open source, free, cross platform IDE specialized in C, C++, PHP and JavaScript
(mainly for backend developers using Node.js) programming languages
4 changes: 2 additions & 2 deletions InnoSetup/codelite64_mingw.iss
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
AppName=CodeLite
AppVerName=CodeLite
AppPublisher=Eran Ifrah
AppVersion=8.2.4
AppVersion=8.2.5
AppPublisherURL=http://codelite.org
AppSupportURL=http://codelite.org
AppUpdatesURL=http://codelite.org
DefaultDirName={pf64}\CodeLite
DefaultGroupName=CodeLite
LicenseFile=license.txt
OutputDir=output
OutputBaseFilename=codelite-amd64-8.2.4
OutputBaseFilename=codelite-amd64-8.2.5
ChangesEnvironment=yes
FlatComponentsList=yes
SetupIconFile=box_software.ico
Expand Down
4 changes: 2 additions & 2 deletions InnoSetup/codelite_mingw.iss
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
AppName=CodeLite
AppVerName=CodeLite
AppPublisher=Eran Ifrah
AppVersion=8.2.4
AppVersion=8.2.5
AppPublisherURL=http://codelite.org
AppSupportURL=http://codelite.org
AppUpdatesURL=http://codelite.org
DefaultDirName={pf}\CodeLite
DefaultGroupName=CodeLite
LicenseFile=license.txt
OutputDir=output
OutputBaseFilename=codelite-x86-8.2.4
OutputBaseFilename=codelite-x86-8.2.5
ChangesEnvironment=yes
FlatComponentsList=yes
SetupIconFile=box_software.ico
Expand Down
5 changes: 2 additions & 3 deletions LiteEditor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ if(NOT APPLE)
install(FILES ${CL_SRC_ROOT}/Runtime/codelite_fix_files DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
install(FILES ${CL_SRC_ROOT}/Runtime/codelite_kill_children DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
install(FILES ${CL_SRC_ROOT}/Runtime/codelite_xterm DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
install(FILES ${CL_SRC_ROOT}/Runtime/clg++ DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
install(FILES ${CL_SRC_ROOT}/Runtime/clgcc DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
endif (UNIX)

## codelite icons
Expand Down Expand Up @@ -162,6 +160,7 @@ if(NOT APPLE)
if (UNIX AND CL_COPY_WX_LIBS) # If we're packaging with wx2.9
# We need to deduce the location of the wx libs to be installed
execute_process(COMMAND ${WX_TOOL} --libs OUTPUT_VARIABLE WX_LIBSOUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE)

if (${WX_LIBSOUTPUT} MATCHES "^-L.+") # In recent, multi-architecture, distro versions it'll start with -L/foo/bar
string(REGEX REPLACE "^-L([^ ;]+).*" "\\1" WX_LIBS_DIR ${WX_LIBSOUTPUT})
else()
Expand All @@ -183,7 +182,7 @@ if(NOT APPLE)
endif()
endforeach()

file(GLOB wxfilepaths ${WX_LIBS_ALL})
file(GLOB wxfilepaths ${WX_LIBS_ALL})
install(FILES ${wxfilepaths} DESTINATION ${CL_PREFIX}/${CL_INSTALL_LIBDIR}/codelite)
endif()

Expand Down
1 change: 1 addition & 0 deletions LiteEditor/LiteEditor.project
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@
<File Name="../codelite_echo/CMakeLists.txt"/>
</VirtualDirectory>
<File Name="../TODO.TXT"/>
<File Name="../DESC"/>
</VirtualDirectory>
<VirtualDirectory Name="Docking Windows">
<File Name="output_pane.cpp"/>
Expand Down
2 changes: 1 addition & 1 deletion LiteEditor/autoversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
#define CL_GIT_REVISION

#include <wx/string.h>
const wxChar* clGitRevision = wxT("8.2.4");
const wxChar* clGitRevision = wxT("8.2.5");
#endif

0 comments on commit a2b378b

Please sign in to comment.