Review which built files are really needed in the dist tarball

Several were only there because they used to be generated via autogen.sh
and hence had to be included because autogen.sh was not supposed to be run
in a tarball based build.
A few others aren't clear so I have left them in for now:
- gnucash.1 (man page)
- gnucash-design.info (because it's unclear what we want to do with that one)

These files should clearly be in the tarball:
- gnucash.pot -> for our translators
- ChangeLog -> can't be generated outside of a git repo
- gnc-vcs-info.h -> can't be generated outside of a git repo
- guile/python bindings -> to avoid a swig dependency when building from tarball
This commit is contained in:
Geert Janssens 2018-01-29 17:29:40 +01:00
parent 9d8def84f3
commit ec213360f3
7 changed files with 10 additions and 19 deletions

View File

@ -774,11 +774,11 @@ if (BUILDING_FROM_VCS)
COMMAND ${GIT_EXECUTABLE} log --format=\"%ad %aN %n%n%x09* %s%d%n\" --date=short --since=2018-01-01 > ${CMAKE_BINARY_DIR}/ChangeLog
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
dist_add_generated(ChangeLog)
install(FILES ${CMAKE_BINARY_DIR}/ChangeLog DESTINATION ${CMAKE_INSTALL_DOCDIR})
else()
install(FILES ${CMAKE_SOURCE_DIR}/ChangeLog DESTINATION ${CMAKE_INSTALL_DOCDIR})
endif()
dist_add_generated(ChangeLog)
############################ BEGIN MAKE DIST #################
# For now only enable the dist target when building from git

View File

@ -32,8 +32,9 @@ ADD_DEFINITIONS (-DHAVE_CONFIG_H)
# Some settings are platform dependent. Let's define them per platform.
IF (WIN32)
# Windows specific settings go here:
SET (GNUCASH_RESOURCE_FILE gnucash.rc)
# Windows specific settings go here:
set (GNUCASH_RESOURCE_FILE gnucash.rc)
configure_file(gnucash.rc.in gnucash.rc @ONLY NEWLINE_STYLE WIN32)
ELSE (WIN32)
# All other platforms use these settings:
@ -110,8 +111,6 @@ SET(GNUCASH_BIN_INSTALL_NAME "gnucash")
SET(VALGRIND_OUTDIR ${BINDIR_BUILD})
configure_file(gnucash.rc.in gnucash.rc @ONLY NEWLINE_STYLE WIN32)
dist_add_configured(gnucash.rc)
configure_file(gnucash-valgrind.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind @ONLY)
FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind

View File

@ -32,10 +32,6 @@ ADD_CUSTOM_COMMAND(
${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_H} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-h.xsl ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA}
)
ADD_CUSTOM_TARGET(gnc-warnings-c DEPENDS ${GNC_WARNINGS_C})
dist_add_generated(gnc-warnings.c)
# FIXME why is gnc-warnings.c added to dist and gnc-warnings.h not ? I think neither is necessary...
#GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK
if (NOT have_mod_mask)
if (MAC_INTEGRATION)

View File

@ -175,7 +175,7 @@ ADD_CUSTOM_COMMAND(
LC_ALL=C
${PERL_EXECUTABLE} ${INTLTOOL_MERGE} -x -u -c ${CMAKE_SOURCE_DIR}/po/.intltool-merge-cache ${CMAKE_SOURCE_DIR}/po
${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in gnucash.appdata.xml
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
)
ADD_CUSTOM_TARGET(gnucash-appdata ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml)
@ -185,8 +185,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml DESTINATION ${CMA
#=======
configure_file(gnucash.desktop.in.in gnucash.desktop.in)
dist_add_configured(gnucash.desktop.in)
ADD_CUSTOM_COMMAND(
OUTPUT gnucash.desktop
@ -194,7 +192,7 @@ ADD_CUSTOM_COMMAND(
LC_ALL=C
${PERL_EXECUTABLE} ${INTLTOOL_MERGE} -d -u -c ${CMAKE_SOURCE_DIR}/po/.intltool-merge-cache ${CMAKE_SOURCE_DIR}/po
gnucash.desktop.in gnucash.desktop
MAIN_DEPENDENCY gnucash.desktop.in
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop.in
)
ADD_CUSTOM_TARGET(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop)

View File

@ -28,7 +28,6 @@ SET(VERSION_TEXI_IN
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.texi ${VERSION_TEXI_IN})
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/stamp-vti ${VERSION_TEXI_IN})
dist_add_configured(version.texi stamp-vti)
FILE(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" TEXI_BINARY_DIR)
FILE(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/gnucash-design.texi" TEXI_SOURCE_FILE)

View File

@ -134,7 +134,6 @@ ADD_CUSTOM_COMMAND (
${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${ISO_4217_C} "${CMAKE_CURRENT_SOURCE_DIR}/iso-currencies-to-c.xsl" "${CMAKE_CURRENT_SOURCE_DIR}/iso-4217-currencies.xml"
)
ADD_CUSTOM_TARGET(iso-4217-c DEPENDS ${ISO_4217_C})
dist_add_generated(iso-4217-currencies.c)
SET (engine_SOURCES
Account.cpp
@ -230,8 +229,8 @@ ADD_LIBRARY (gncmod-engine
${engine_noinst_HEADERS}
)
# Add dependency on swig-runtime.h
add_dependencies (gncmod-engine swig-runtime-h)
# Add dependency on swig-runtime.h and iso-4217-currencies.c
add_dependencies (gncmod-engine swig-runtime-h iso-4217-c)
TARGET_LINK_LIBRARIES(gncmod-engine gnc-core-utils gnc-module ${Boost_DATE_TIME_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${REGEX_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GUILE_LDFLAGS})

View File

@ -8,7 +8,7 @@ SET (scm_SCHEME_4
)
configure_file(build-config.scm.in ${BUILD_CONFIG_SCM})
dist_add_configured(build-config.scm)
add_custom_target(build-config-scm DEPENDS ${BUILD_CONFIG_SCM})
SET(GUILE_DEPENDS scm-core-utils scm-gnc-module)
@ -27,7 +27,7 @@ GNC_ADD_SCHEME_TARGETS(scm-scm-1 "printf.scm" gnucash "" FALSE)
GNC_ADD_SCHEME_TARGETS(scm-scm-2
main.scm
gnucash
"scm-scm-1;${GUILE_DEPENDS}" # requires printf.scm from scm-scm-1 and modules from GUILE_DEPENDS
"scm-scm-1;${GUILE_DEPENDS};build-config-scm" # requires printf.scm from scm-scm-1 and modules from GUILE_DEPENDS
FALSE
)