From 27384fc70dd7570864cb1045625b32b0f263b726 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 13 May 2017 17:01:24 +0300 Subject: [PATCH 1/5] Do not create symlink to executable on macOS too This link in build directory pointed to non-existing file since we started to create application bundle with CMake --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb8871bd77..387d6855f0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1253,7 +1253,7 @@ if( MSVC ) create_default_target_launcher( zdoom WORKING_DIRECTORY ${ZDOOM_OUTPUT_DIR} ) endif() -if( NOT WIN32 ) +if( NOT WIN32 AND NOT APPLE ) FILE( WRITE ${CMAKE_CURRENT_BINARY_DIR}/link-make "if [ ! -e ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME} ]; then ln -sf ${CMAKE_CURRENT_BINARY_DIR}/${ZDOOM_EXE_NAME} ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME}; fi" ) add_custom_command( TARGET zdoom POST_BUILD COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/link-make From 1cd7297cd8d4fa0f4ab58b1db425d08476084ddd Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 13 May 2017 17:20:58 +0300 Subject: [PATCH 2/5] Use Xcode 8.3 for Travis CI build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d4cc4bb79..77a2ea7ce9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ git: matrix: include: - os: osx - osx_image: xcode8.2 + osx_image: xcode8.3 env: - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7" From f0d40d6a8aaa772e3b6d0e9b0f5f3dc0175efdcc Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 13 May 2017 17:56:26 +0300 Subject: [PATCH 3/5] Added check for patch set existence before loading in FluidSynth This helps to avoid flooding of output with the following messages on every MIDI song change: fluidsynth: error: Unable to open file "/usr/share/sounds/sf2/FluidR3_GS.sf2" fluidsynth: error: Couldn't load soundfont file fluidsynth: error: Failed to load SoundFont "/usr/share/sounds/sf2/FluidR3_GS.sf2" fluidsynth: error: Unable to open file "/usr/share/sounds/sf2/FluidR3_GM.sf2" fluidsynth: error: Couldn't load soundfont file fluidsynth: error: Failed to load SoundFont "/usr/share/sounds/sf2/FluidR3_GM.sf2" --- .../mididevices/music_fluidsynth_mididevice.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/sound/mididevices/music_fluidsynth_mididevice.cpp b/src/sound/mididevices/music_fluidsynth_mididevice.cpp index 38c8eed226..07102c43d6 100644 --- a/src/sound/mididevices/music_fluidsynth_mididevice.cpp +++ b/src/sound/mididevices/music_fluidsynth_mididevice.cpp @@ -526,14 +526,21 @@ int FluidSynthMIDIDevice::LoadPatchSets(const char *patches) { path = NicePath(tok); } - if (FLUID_FAILED != fluid_synth_sfload(FluidSynth, path, count == 0)) + if (FileExists(path)) { - DPrintf(DMSG_NOTIFY, "Loaded patch set %s.\n", tok); - count++; + if (FLUID_FAILED != fluid_synth_sfload(FluidSynth, path, count == 0)) + { + DPrintf(DMSG_NOTIFY, "Loaded patch set %s.\n", tok); + count++; + } + else + { + DPrintf(DMSG_ERROR, "Failed to load patch set %s.\n", tok); + } } else { - DPrintf(DMSG_ERROR, "Failed to load patch set %s.\n", tok); + DPrintf(DMSG_ERROR, "Could not find patch set %s.\n", tok); } tok = strtok(NULL, delim); } From b346dd0c09b146d6979fbac2bd6536719ce847cb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 13 May 2017 17:45:24 +0200 Subject: [PATCH 4/5] - added a check for unconnected linked line portals. --- src/portal.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/portal.cpp b/src/portal.cpp index 9926f289ec..0b74359a65 100644 --- a/src/portal.cpp +++ b/src/portal.cpp @@ -1027,8 +1027,17 @@ void P_CreateLinkedPortals() { if (linePortals[i].mType == PORTT_LINKED) { - if (CollectSectors(id, linePortals[i].mOrigin->frontsector)) id++; - if (CollectSectors(id, linePortals[i].mDestination->frontsector)) id++; + if (linePortals[i].mDestination == nullptr) + { + Printf("Linked portal on line %d is unconnected and will be disabled\n", linePortals[i].mOrigin->Index()); + linePortals[i].mOrigin->portalindex = UINT_MAX; + linePortals[i].mType = PORTT_VISUAL; + } + else + { + if (CollectSectors(id, linePortals[i].mOrigin->frontsector)) id++; + if (CollectSectors(id, linePortals[i].mDestination->frontsector)) id++; + } } } From fa36b1195fd918122f41024c634be04b8b5a5aa4 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 13 May 2017 12:52:28 -0400 Subject: [PATCH 5/5] - added modification tagging to updaterevision to allow tagging an executable when a source tree is compiled before committing. --- tools/updaterevision/updaterevision.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/updaterevision/updaterevision.c b/tools/updaterevision/updaterevision.c index 7260f41316..bbb6dddf3a 100644 --- a/tools/updaterevision/updaterevision.c +++ b/tools/updaterevision/updaterevision.c @@ -51,7 +51,7 @@ int main(int argc, char **argv) // on a tag, it returns that tag. Otherwise it returns --. // Use git log to get the time of the latest commit in ISO 8601 format and its full hash. - stream = popen("git describe --tags && git log -1 --format=%ai*%H", "r"); + stream = popen("git describe --tags --dirty=-m && git log -1 --format=%ai*%H", "r"); if (NULL != stream) {