Yes, I should have.  I'll do that now.

--
Mark Miesfeld


On Sun, Jun 8, 2014 at 3:59 PM, Rick McGuire <object.r...@gmail.com> wrote:

> Mark,
>
> did you need to checkin the cpack.nsi file with this commit?
>
> Rick
>
>
> ---------- Forwarded message ----------
> From: <miesf...@users.sf.net>
> Date: Sun, Jun 8, 2014 at 6:27 PM
> Subject: [Oorexx-svn] SF.net SVN: oorexx-code-0:[10144]
> main/trunk/CMakeLists.txt
> To: oorexx-...@lists.sourceforge.net
>
>
> Revision: 10144
>           http://sourceforge.net/p/oorexx/code-0/10144
> Author:   miesfeld
> Date:     2014-06-08 22:27:52 +0000 (Sun, 08 Jun 2014)
> Log Message:
> -----------
> Fix up the Windows custom nsis_installer target so it works
>
> Modified Paths:
> --------------
>     main/trunk/CMakeLists.txt
>
> Modified: main/trunk/CMakeLists.txt
> ===================================================================
> --- main/trunk/CMakeLists.txt   2014-06-08 22:12:46 UTC (rev 10143)
> +++ main/trunk/CMakeLists.txt   2014-06-08 22:27:52 UTC (rev 10144)
> @@ -85,6 +85,7 @@
>      ENDMACRO(Subversion_GET_REVISION)
>
>      Subversion_GET_REVISION(${CMAKE_SOURCE_DIR} ORX_BLD_LVL)
> +    set (ORX_VERSION_NSIS
> ${ORX_MAJOR}.${ORX_MINOR}.${ORX_MOD_LVL}.${ORX_BLD_LVL})
>  endif ()
>
>  message(STATUS "SVN Revision Number is ${ORX_BLD_LVL}")
> @@ -1392,7 +1393,7 @@
>     # directories in native form first
>
>     file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} NATIVE_SOURCE_DIR)
> -   file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} NATIVE_BINARY_DIR)
> +   file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin NATIVE_BINARY_DIR)
>
>     add_custom_target(nsis_installer
>        DEPENDS ${DOC_SOURCE_DIR}/readme.pdf
> @@ -1407,7 +1408,7 @@
>                ${DOC_SOURCE_DIR}/winextensions.pdf
>                ${build_platform_dir}/install/cpack.nsi
>        VERBATIM
> -      COMMAND ${NSIS_EXECUTABLE} "/DVERSION=${ORX_VERSION}
> /DNODOTVER=${ORX_NODOT_VERSION} /DSRCDIR=${NATIVE_SOURCE_DIR}
> /DBINDIR=${NATIVE_BINARY_DIR} /DCPU=${CPU} cpack.nsi"
> +      COMMAND ${NSIS_EXECUTABLE} /DVERSION=${ORX_VERSION_NSIS}
> /DNODOTVER=${ORX_NODOT_VERSION} /DSRCDIR=${NATIVE_SOURCE_DIR}
> /DBINDIR=${NATIVE_BINARY_DIR} /DCPU=${CPU} cpack.nsi
>        WORKING_DIRECTORY
> ${CMAKE_CURRENT_SOURCE_DIR}/${build_platform_dir}/install
>        COMMENT "Building NSIS installer")
>  endif()
>
>
>
> ------------------------------------------------------------------------------
> Learn Graph Databases - Download FREE O'Reilly Book
> "Graph Databases" is the definitive new guide to graph databases and their
> applications. Written by three acclaimed leaders in the field,
> this first edition is now available. Download your free book today!
> http://p.sf.net/sfu/NeoTech
> _______________________________________________
> Oorexx-svn mailing list
> oorexx-...@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/oorexx-svn
>
>
>
> ------------------------------------------------------------------------------
> Learn Graph Databases - Download FREE O'Reilly Book
> "Graph Databases" is the definitive new guide to graph databases and their
> applications. Written by three acclaimed leaders in the field,
> this first edition is now available. Download your free book today!
> http://p.sf.net/sfu/NeoTech
> _______________________________________________
> Oorexx-devel mailing list
> Oorexx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/oorexx-devel
>
>
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their 
applications. Written by three acclaimed leaders in the field, 
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Oorexx-devel mailing list
Oorexx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oorexx-devel

Reply via email to