Skip to content

Commit

Permalink
Merge pull request #6564 from NREL/PrepFor89Again
Browse files Browse the repository at this point in the history 
Final approach on 8.9.0
  • Loading branch information
@Myoldmopar
Myoldmopar authored Mar 23, 2018
2 parents f75dd06 + 370d5b8 commit 40101ea
Show file tree
Hide file tree
Showing 23 changed files with 833 additions and 56,309 deletions.
6 changes: 4 additions & 2 deletions cmake/CPack.STGZ_Header.sh.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${inst

echo "Unpacking to directory ${install_directory} was successful."

link_err ()
link_err ()
{
echo "Error creating symbolic links"
exit 0
Expand All @@ -92,6 +92,7 @@ if [ ! "$link_directory" = "n" ]; then
ln -sf "${install_directory}/${package_name}/energyplus" "${link_directory}/EnergyPlus" 2> /dev/null > /dev/null || link_err
ln -sf "${install_directory}/${package_name}/energyplus" "${link_directory}/energyplus" 2> /dev/null > /dev/null || link_err
ln -sf "${install_directory}/${package_name}/Energy+.idd" "${link_directory}" 2> /dev/null > /dev/null || link_err
ln -sf "${install_directory}/${package_name}/Energy+.schema.epJSON" "${link_directory}" 2> /dev/null > /dev/null || link_err
ln -sf "${install_directory}/${package_name}/PostProcess/EP-Compare/EP-Compare" "${link_directory}" 2> /dev/null > /dev/null || link_err
ln -sf "${install_directory}/${package_name}/EPMacro" "${link_directory}" 2> /dev/null > /dev/null || link_err
ln -sf "${install_directory}/${package_name}/ExpandObjects" "${link_directory}" 2> /dev/null > /dev/null || link_err
Expand All @@ -108,13 +109,14 @@ if [ ! "$link_directory" = "n" ]; then
ln -sf "${install_directory}/${package_name}/PreProcess/IDFVersionUpdater/Transition-V8-2-0-to-V8-3-0" "${link_directory}" 2> /dev/null > /dev/null || link_err
ln -sf "${install_directory}/${package_name}/PreProcess/IDFVersionUpdater/V8-2-0-Energy+.idd" "${link_directory}" 2> /dev/null > /dev/null || link_err
ln -sf "${install_directory}/${package_name}/PreProcess/IDFVersionUpdater/V8-3-0-Energy+.idd" "${link_directory}" 2> /dev/null > /dev/null || link_err
(
(
cat <<-HERE
rm -f "${link_directory}/Basement"
rm -f "${link_directory}/BasementGHT.idd"
rm -f "${link_directory}/convertESOMTR"
rm -f "${link_directory}/EnergyPlus"
rm -f "${link_directory}/Energy+.idd"
rm -f "${link_directory}/Energy+.schema.epJSON"
rm -f "${link_directory}/EP-Compare"
rm -f "${link_directory}/EPMacro"
rm -f "${link_directory}/ExpandObjects"
Expand Down
3 changes: 2 additions & 1 deletion cmake/Install.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ install(FILES "${CMAKE_SOURCE_DIR}/LICENSE.txt" DESTINATION "./")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")

install( FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION ./ )
install( FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.schema.epJSON" DESTINATION ./ )

# Some docs are generated on the fly here, create a dir for the 'built' files
set( DOCS_OUT "${CMAKE_BINARY_DIR}/autodocs" )
Expand All @@ -56,7 +57,7 @@ if(NOT "$ENV{GITHUB_TOKEN}" STREQUAL "")
install(CODE "execute_process(COMMAND \"${PYTHON_EXECUTABLE}\" \"${CMAKE_SOURCE_DIR}/doc/tools/create_changelog.py\" \"${CMAKE_SOURCE_DIR}\" \"${DOCS_OUT}/changelog.md\" \"${DOCS_OUT}/changelog.html\" \"${GIT_EXECUTABLE}\" \"$ENV{GITHUB_TOKEN}\" \"${PREV_RELEASE_SHA}\" \"${CPACK_PACKAGE_VERSION}\")")
install(FILES "${DOCS_OUT}/changelog.html" DESTINATION "./" OPTIONAL)
else()
message(WARNING "No GITHUB_TOKEN found in environment; package won't be complete")
message(WARNING "No GITHUB_TOKEN found in environment; package won't include the change log")
endif()

# Install files that are in the current repo
Expand Down
1 change: 0 additions & 1 deletion cmake/RunCallbackTest.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${SOURCE_DIR}/testfiles/${IDF_FILE}" "${BINARY_DIR}/${TEST_DIR}/in.idf" )
execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${SOURCE_DIR}/weather/${EPW_FILE}" "${BINARY_DIR}/${TEST_DIR}/in.epw" )
execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${BINARY_DIR}/Products/Energy+.idd" "${BINARY_DIR}/${TEST_DIR}/Energy+.idd" )
execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${BINARY_DIR}/Products/Energy+.schema.epJSON" "${BINARY_DIR}/${TEST_DIR}/Energy+.schema.epJSON" )

# Find and execute the test executable, passing the argument of the directory to run in
if( WIN32 )
Expand Down
5 changes: 3 additions & 2 deletions cmake/darwinpostflight.sh.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ ln -sf "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PreProcess/GrndTempCalc/BasementGHT.i
ln -sf "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PostProcess/convertESOMTRpgm/convertESOMTR" /usr/bin/
ln -sf "$2@CPACK_PACKAGING_INSTALL_PREFIX@/EnergyPlus" /usr/bin/
ln -sf "$2@CPACK_PACKAGING_INSTALL_PREFIX@/Energy+.idd" /usr/bin/
ln -sf "$2@CPACK_PACKAGING_INSTALL_PREFIX@/Energy+.schema.epJSON" /usr/bin/
ln -sf "$2@CPACK_PACKAGING_INSTALL_PREFIX@/EPMacro" /usr/bin/
ln -sf "$2@CPACK_PACKAGING_INSTALL_PREFIX@/ExpandObjects" /usr/bin/
ln -sf "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PostProcess/HVAC-Diagram" /usr/bin/
Expand All @@ -21,10 +22,10 @@ mv "$2@CPACK_PACKAGING_INSTALL_PREFIX@/energyplus.1" /usr/local/share/man/man1/
chmod -R a+w "$2@CPACK_PACKAGING_INSTALL_PREFIX@"
chmod -R a+w "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PreProcess/IDFVersionUpdater/IDFVersionUpdater.app/Contents/MacOS/"
chmod -R a+w "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PreProcess/IDFVersionUpdater/"
if [ -e "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PreProcess/IDFVersionUpdater/IDFVersionUpdater.app/" ]; then
if [ -e "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PreProcess/IDFVersionUpdater/IDFVersionUpdater.app/" ]; then
chmod +x "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PreProcess/IDFVersionUpdater/IDFVersionUpdater.app/Contents/MacOS/IDFVersionUpdater"
fi
if [ -e "$2@CPACK_PACKAGING_INSTALL_PREFIX@/Uninstall EnergyPlus.app" ]; then
if [ -e "$2@CPACK_PACKAGING_INSTALL_PREFIX@/Uninstall EnergyPlus.app" ]; then
chmod +x "$2@CPACK_PACKAGING_INSTALL_PREFIX@/Uninstall EnergyPlus.app/Contents/MacOS/applet"
fi
if [ -e "$2@CPACK_PACKAGING_INSTALL_PREFIX@/PreProcess/EP-Launch-Lite.app" ]; then
Expand Down
Loading

8 comments on commit 40101ea

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - i386-Windows-7-VisualStudio-14: OK (2297 of 2297 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - Win64-Windows-7-VisualStudio-14: OK (2297 of 2297 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-MacOS-10.9-clang: OK (2297 of 2297 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (2317 of 2317 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (1672 of 1672 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (2300 of 2300 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-14.04-custom_check: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

Please sign in to comment.