Skip to content

Commit

Permalink
Update cmake package build rules for Mac
Browse files Browse the repository at this point in the history
Use Dave naming rules for V5 plugin name:
${VERBOSE_NAME}-Plugin-${OCPN_MIN_VERSION}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
With OCPN_MIN_VERSION : ov50
  • Loading branch information
did-g committed Feb 11, 2019
1 parent 8b824a0 commit e04a477
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ script:
cp /tmp/cairo_macos107/lib/libcairo.2.dylib /tmp/opencpn/bin/OpenCPN.app/Contents/MacOS/;
make install;
make create-pkg;
ls -l;
fi

notifications:
Expand Down
2 changes: 1 addition & 1 deletion buildosx/InstallOSX/ocpn_draw_pi.pkgproj.in
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@
</dict>
</array>
<key>NAME</key>
<string>${VERBOSE_NAME}-Plugin-${OCPN_VERSION}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}</string>
<string>${VERBOSE_NAME}-Plugin-${OCPN_MIN_VERSION}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}</string>
<key>REFERENCE_FOLDER_PATH</key>
<string>.</string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions cmake/PluginPackage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,15 @@ configure_file(${PROJECT_SOURCE_DIR}/buildosx/InstallOSX/pkg_background.jpg
${CMAKE_CURRENT_BINARY_DIR}/${VERBOSE_NAME}.pkgproj)

ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${VERBOSE_NAME}-${OCPN_MIN_VERSION}-Plugin.pkg
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${VERBOSE_NAME}-Plugin-${OCPN_MIN_VERSION}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.pkg
COMMAND /usr/local/bin/packagesbuild -F ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${VERBOSE_NAME}.pkgproj
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${PACKAGE_NAME}
COMMENT "create-pkg [${PACKAGE_NAME}]: Generating pkg file."
)

ADD_CUSTOM_TARGET(create-pkg COMMENT "create-pkg: Done."
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${VERBOSE_NAME}-Plugin.pkg )
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${VERBOSE_NAME}-Plugin-${OCPN_MIN_VERSION}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.pkg )


ENDIF(APPLE)

0 comments on commit e04a477

Please sign in to comment.