From e5ed034023e8478c217935f634c0be8105267c38 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Thu, 10 Jan 2019 23:31:23 +0000 Subject: [PATCH] Pruned gitignore files. --- .gitignore | 114 ++++++--------------------------- Jenkinsfile | 12 ++++ config.tests/gl/.gitignore | 5 ++ config.tests/glu/.gitignore | 5 ++ config.tests/libpng/.gitignore | 5 ++ config.tests/zlib/.gitignore | 5 ++ 6 files changed, 51 insertions(+), 95 deletions(-) create mode 100644 config.tests/gl/.gitignore create mode 100644 config.tests/glu/.gitignore create mode 100644 config.tests/libpng/.gitignore create mode 100644 config.tests/zlib/.gitignore diff --git a/.gitignore b/.gitignore index 7e5630560..61afd5372 100644 --- a/.gitignore +++ b/.gitignore @@ -1,89 +1,14 @@ -# In repository we don't need to have: -# Compiled object files -*.o - -# Generated MOC, resource and UI files -moc_*.cpp -qrc_*.cpp -ui_*.h - -# MSVC generated precompiled source +# MSVC generated precompiled sources pch.h.cpp # QtCreator project files -*.pro.user* +/swift.pro.user -# Debug and Release directories (created under Windows, not Linux) -# Additional the CMake build folder -bin/ -obj/ -Debug/ -Release/ -ReleaseDebug/ -DebugFast/ -ReleaseDebugStatic/ -DebugFastStatic/ -build/ -Makefile - -# .log files (usually created by QtTest - thanks to VestniK) -*.log - -# Windows compile -*.exe -*.dll -*.lib -*.obj - -# Exception for XPlane object files -!src/xswiftbus/LegacyData/**/*.obj - -# Linux compile -*.a -*.la -*.lo -*.Po -*.Plo -*.o -*.so -*.so.* -*_debug -core -*.pc -*.gch - -# Mac OS X compile -*.dylib - -# CMake stuff -CMakeCache.txt -cmake_install.cmake -CTestTestfile.cmake -CPackConfig.cmake -CPackSourceConfig.cmake -.libs +# Out-of-source build tree +/build*/ # Visual Studio stuff -*.opensdf -UpgradeLog*.XML -_UpgradeReport_Files -BuildLog.htm -mt.dep -ipch -*.suo -*.ncb -*.user -*.ilk -*.pdb -*.aps -*.exp -*.idb -*.sdf -*.vspx -*.vcxproj -*.vcxproj.filters -*/.vs/* -.vs/* +/.vs/ # Qt Creator *.autosave @@ -91,7 +16,7 @@ ipch # Mac OS X stuff .DS_Store -# Windows-specific files +# Windows stuff Thumbs.db desktop.ini @@ -99,19 +24,18 @@ desktop.ini *~ # qmake -.qmake.stash -.qmake.cache +/.qmake.stash -# Qt Creator -/client.pro.user.2.7pre1 -/client.pro.user.3.0-pre1 -/client.pro.user.15 -/client.pro.user.3.2-pre1 -/client.pro.user.16 -/client.pro.user.3.3-pre1 -/client.pro.user.18 +# Generated installers +/swiftinstaller-*.run +/swiftinstaller-*.exe +/swiftinstaller-*.dmg +/swiftsymbols-*.tar.gz +/xswiftbus-*.7z -# Qt Creator Qt plugin -plugins.sln -weatherdata.sln -simulator.sln +# Python +/scripts/**/*.pyc +/scripts/**/__pycache__ + +# VATSIM key +/vatsim.json diff --git a/Jenkinsfile b/Jenkinsfile index 5cea15d92..cf2c2c9f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,6 +27,9 @@ builders['Build swift Linux'] = { xunit testTimeMargin: '3000', thresholdMode: 1, thresholds: [failed(), skipped()], tools: [QtTest(deleteOutputFiles: true, failIfNotNew: false, pattern: 'build/out/release/bin/*_testresults.xml', skipNoTestFiles: true, stopProcessingIfError: false)] + + def status = sh(script: 'git status -s | grep "^??"', returnStatus: true) + if (status == 0) { error 'Source tree got polluted by some untracked file(s)' } } stage('Linux Checks') { @@ -79,6 +82,9 @@ builders['Build swift MacOS'] = { xunit testTimeMargin: '3000', thresholdMode: 1, thresholds: [failed(), skipped()], tools: [QtTest(deleteOutputFiles: true, failIfNotNew: false, pattern: 'build/out/release/bin/*_testresults.xml', skipNoTestFiles: true, stopProcessingIfError: false)] + + def status = sh(script: 'git status -s | grep "^??"', returnStatus: true) + if (status == 0) { error 'Source tree got polluted by some untracked file(s)' } } stage('MacOS Archive') { @@ -120,6 +126,9 @@ builders['Build swift Win32'] = { xunit testTimeMargin: '3000', thresholdMode: 1, thresholds: [failed(), skipped()], tools: [QtTest(deleteOutputFiles: true, failIfNotNew: false, pattern: 'build/out/release/bin/*_testresults.xml', skipNoTestFiles: true, stopProcessingIfError: false)] + + def status = bat(script: 'git status -s | findstr /b "??"', returnStatus: true) + if (status == 0) { error 'Source tree got polluted by some untracked file(s)' } } stage('Win32 Archive') { @@ -162,6 +171,9 @@ builders['Build swift Win64'] = { xunit testTimeMargin: '3000', thresholdMode: 1, thresholds: [failed(), skipped()], tools: [QtTest(deleteOutputFiles: true, failIfNotNew: false, pattern: 'build/out/release/bin/*_testresults.xml', skipNoTestFiles: true, stopProcessingIfError: false)] + + def status = bat(script: 'git status -s | findstr /b "??"', returnStatus: true) + if (status == 0) { error 'Source tree got polluted by some untracked file(s)' } } stage('Win64 Archive') { diff --git a/config.tests/gl/.gitignore b/config.tests/gl/.gitignore new file mode 100644 index 000000000..01e024f1e --- /dev/null +++ b/config.tests/gl/.gitignore @@ -0,0 +1,5 @@ +Makefile +gl.obj +gl.o +gl.exe +gl diff --git a/config.tests/glu/.gitignore b/config.tests/glu/.gitignore new file mode 100644 index 000000000..8a413a5d1 --- /dev/null +++ b/config.tests/glu/.gitignore @@ -0,0 +1,5 @@ +Makefile +glu.obj +glu.o +glu.exe +glu diff --git a/config.tests/libpng/.gitignore b/config.tests/libpng/.gitignore new file mode 100644 index 000000000..c1087dd56 --- /dev/null +++ b/config.tests/libpng/.gitignore @@ -0,0 +1,5 @@ +Makefile +libpng.obj +libpng.o +libpng.exe +libpng diff --git a/config.tests/zlib/.gitignore b/config.tests/zlib/.gitignore new file mode 100644 index 000000000..07324a6f5 --- /dev/null +++ b/config.tests/zlib/.gitignore @@ -0,0 +1,5 @@ +Makefile +zlib.obj +zlib.o +zlib.exe +zlib