Pruned gitignore files.

This commit is contained in:
Mat Sutcliffe
2019-01-10 23:31:23 +00:00
parent e374573536
commit e5ed034023
6 changed files with 51 additions and 95 deletions

114
.gitignore vendored
View File

@@ -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

12
Jenkinsfile vendored
View File

@@ -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') {

5
config.tests/gl/.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
Makefile
gl.obj
gl.o
gl.exe
gl

5
config.tests/glu/.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
Makefile
glu.obj
glu.o
glu.exe
glu

5
config.tests/libpng/.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
Makefile
libpng.obj
libpng.o
libpng.exe
libpng

5
config.tests/zlib/.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
Makefile
zlib.obj
zlib.o
zlib.exe
zlib