Browse Source

fix missing cmake flag with configure wrapper

tags/v6.0.1
Chris Cromer 2 years ago
parent
commit
cc52ac1ce8

+ 2
- 1
.configure-custom.sh View File

@@ -2,5 +2,6 @@

ENABLE_VARS="kde-tray|ON|KDE_TRAY"
ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray"
DISABLE_VARS="aur|ON|DISABLE_AUR"
DISABLE_VARS="aur|ON|DISABLE_AUR icon-update|OFF|ICON_UPDATE"
DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac"
DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing"

+ 2
- 1
autovala/configure-custom.sh View File

@@ -2,5 +2,6 @@

ENABLE_VARS="kde-tray|ON|KDE_TRAY"
ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray"
DISABLE_VARS="aur|ON|DISABLE_AUR"
DISABLE_VARS="aur|ON|DISABLE_AUR icon-update|OFF|ICON_UPDATE"
DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac"
DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing"

+ 7
- 7
pamac.avprj View File

@@ -34,7 +34,7 @@ end
vapidir: src/vapis

vala_binary: src/pamac-install/pamac-install
version: 6.0.0
version: 6.0.1
use_gresource: pamac_installer_gresource_xml
vala_local_package: Pamac
vala_check_package: gtk+-3.0
@@ -45,7 +45,7 @@ vala_check_package: gtk+-3.0
*vala_source: progress_dialog.vala

vala_binary: src/pamac-manager/pamac-manager
version: 6.0.0
version: 6.0.1
use_gresource: pamac_manager_gresource_xml
vala_local_package: Pamac
vala_check_package: gtk+-3.0
@@ -57,7 +57,7 @@ vala_check_package: gtk+-3.0
*vala_source: manager_window.vala

vala_binary: src/pamac-system-daemon/pamac-system-daemon
version: 6.0.0
version: 6.0.1
vala_local_package: Pamac
if NOT DISABLE_AUR
vala_local_package: AUR
@@ -78,7 +78,7 @@ vala_check_package: polkit-gobject-1
*vala_source: system_daemon.vala

vala_binary: src/pamac-tray/pamac-tray
version: 6.0.0
version: 6.0.1
vala_local_package: Pamac
if NOT DISABLE_AUR
vala_local_package: AUR
@@ -104,7 +104,7 @@ end
*vala_source: user_daemon.vala

vala_binary: src/pamac-user-daemon/pamac-user-daemon
version: 6.0.0
version: 6.0.1
vala_local_package: AUR
vala_local_package: Pamac
vala_package: posix
@@ -120,7 +120,7 @@ vala_check_package: libsoup-2.4


vala_library: src/pamac
version: 6.0.0
version: 6.0.1
*namespace: Pamac
use_gresource: pamac_transaction_gresource_xml
vala_package: posix
@@ -145,7 +145,7 @@ vala_check_package: vte-2.91
*vala_source: transaction_sum_dialog.vala

vala_library: src/aur/aur
version: 6.0.0
version: 6.0.1
*namespace: AUR
vala_check_package: json-glib-1.0
vala_check_package: libsoup-2.4

+ 3
- 3
src/CMakeLists.txt View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0")
set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.pc ${CMAKE_CURRENT_BINARY_DIR}/Pamac.pc)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.deps ${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps)
set (VERSION "6.0.0")
set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -85,7 +85,7 @@ add_library(Pamac SHARED ${VALA_C})
add_dependencies (Pamac pamac_transaction_gresource_xml)
set_target_properties( Pamac PROPERTIES
VERSION
6.0.0
6.0.1
SOVERSION
6 )


+ 1
- 1
src/Pamac.pc View File

@@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}

Name: Pamac
Description: Pamac
Version: 6.0.0
Version: 6.0.1
Libs: -L@DOLLAR@{libdir} -lPamac
Cflags: -I@DOLLAR@{includedir}
Requires: gdk-3.0 gtk+-3.0 libalpm libnotify vte-2.91 gio-2.0 glib-2.0 gobject-2.0

+ 1
- 1
src/aur/AUR.pc View File

@@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}

Name: AUR
Description: AUR
Version: 6.0.0
Version: 6.0.1
Libs: -L@DOLLAR@{libdir} -lAUR
Cflags: -I@DOLLAR@{includedir}
Requires: json-glib-1.0 libsoup-2.4 glib-2.0

+ 3
- 3
src/aur/CMakeLists.txt View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0")
set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/aur/Config.vala.base ${CMAKE_BINARY_DIR}
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.pc ${CMAKE_CURRENT_BINARY_DIR}/AUR.pc)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.deps ${CMAKE_CURRENT_BINARY_DIR}/AUR.deps)
set (VERSION "6.0.0")
set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -65,7 +65,7 @@ add_library(AUR SHARED ${VALA_C})

set_target_properties( AUR PROPERTIES
VERSION
6.0.0
6.0.1
SOVERSION
6 )


+ 2
- 2
src/pamac-install/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0")
set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0")
set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lPamac )

+ 2
- 2
src/pamac-manager/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0")
set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0")
set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lPamac )

+ 2
- 2
src/pamac-system-daemon/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0")
set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0")
set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )

+ 2
- 2
src/pamac-tray/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0")
set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0")
set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )

+ 2
- 2
src/pamac-user-daemon/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0")
set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0")
set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src/aur ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lAUR -lPamac )

Loading…
Cancel
Save