Skip to content

Commit e63438b

Browse files
authored
Fixing large source tar (#120)
* Diagnosing large source tar * Ignore ccache for CI
1 parent 4a193a2 commit e63438b

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
.pydevproject
77

88
# Build files
9-
/deps/build
9+
/deps/build/
1010
/build/
1111
/testroot/
1212
/venv/
13-
__pycache__
13+
/.ccache/
14+
__pycache__/
1415
.pytest_cache/
1516
mock-bpa-test/ccsds_bpsec_redbook_requirements_modified.yaml

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,11 @@ if(BUILD_PACKAGE)
196196
# Source packaging as tarball build with target package_source
197197
set(CPACK_SOURCE_GENERATOR "TGZ")
198198
set(CPACK_SOURCE_IGNORE_FILES
199-
".*/?\\.git/"
200-
".*/?\\.pytest_cache/"
201-
".*/?__pycache__/"
199+
"/\\.git/"
200+
"/\\.github/"
201+
"/\\.ccache/"
202+
"/\\.pytest_cache/"
203+
"/__pycache__/"
202204
build/
203205
testroot/
204206
".*~$"

pkg/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ add_custom_command(
3939
add_custom_command(
4040
OUTPUT "${RPMBUILD_TOPDIR}/SOURCES/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz"
4141
DEPENDS "${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz"
42-
COMMAND mkdir -p ${RPMBUILD_TOPDIR}/SOURCES
42+
COMMAND ${CMAKE_COMMAND} -E make_directory ${RPMBUILD_TOPDIR}/SOURCES
4343
COMMAND ${CMAKE_COMMAND} -E create_hardlink "${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz" "${RPMBUILD_TOPDIR}/SOURCES/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz"
4444
COMMENT "Placing ${PROJECT_NAME} source"
4545
)
4646
add_custom_command(
4747
OUTPUT "${RPMBUILD_TOPDIR}/SPECS/bsl.spec"
4848
DEPENDS bsl.spec
49-
COMMAND mkdir -p ${RPMBUILD_TOPDIR}/SPECS
49+
COMMAND ${CMAKE_COMMAND} -E make_directory ${RPMBUILD_TOPDIR}/SPECS
5050
COMMAND ${CMAKE_COMMAND} -E create_hardlink ${CMAKE_CURRENT_BINARY_DIR}/bsl.spec ${RPMBUILD_TOPDIR}/SPECS/bsl.spec
5151
COMMENT "Placing ${PROJECT_NAME} spec"
5252
)

0 commit comments

Comments
 (0)