Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 75d8b7663 -> 0acbc8335


DISPATCH-921 Revert the automatically npm install during a make build and 
update the console README to explain how to do it manually


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/0acbc833
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/0acbc833
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/0acbc833

Branch: refs/heads/master
Commit: 0acbc8335f73be6b25a5578e69297f1a67699699
Parents: 75d8b76
Author: Ernest Allen <eal...@redhat.com>
Authored: Fri Mar 2 10:31:46 2018 -0500
Committer: Ernest Allen <eal...@redhat.com>
Committed: Fri Mar 2 10:31:46 2018 -0500

----------------------------------------------------------------------
 CMakeLists.txt                |  2 +-
 console/CMakeLists.txt        | 51 ++++++++++++++------------------------
 console/stand-alone/README.md |  3 +--
 3 files changed, 21 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0acbc833/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea97e15..55c6e5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ option(QD_MEMORY_STATS "Track memory pool usage statistics" 
ON)
 
 file(STRINGS "${CMAKE_SOURCE_DIR}/VERSION.txt" QPID_DISPATCH_VERSION)
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.6)
 include(CheckLibraryExists)
 include(CheckSymbolExists)
 include(CheckFunctionExists)

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0acbc833/console/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index db57125..8918936 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -25,25 +25,12 @@ set(CONSOLE_BASE_SOURCE_DIR 
"${CMAKE_SOURCE_DIR}/console/stand-alone/")
 option(CONSOLE_INSTALL "Install stand-alone console" ON)
 if(CONSOLE_INSTALL)
 
-  # Static console files
-  install(
-    DIRECTORY ${CONSOLE_BASE_SOURCE_DIR}
+       # Static console files
+       install(
+         DIRECTORY ${CONSOLE_BASE_SOURCE_DIR}
           DESTINATION ${CONSOLE_STAND_ALONE_INSTALL_DIR}
     )
 
-  # run npm install for console if npm is installed
-  find_program(PROG_NPM npm)
-  if (PROG_NPM STREQUAL "PROG_NPM-NOTFOUND")
-    message(WARNING "Program npm not found. You must manually install console 
dependencies.")
-  else ()
-    message(STATUS "Program npm found. Console dependencies will be 
installed.")
-    install(
-      CODE "MESSAGE(\"Installing console dependencies with npm.\")")
-    install(
-      CODE "execute_process(COMMAND npm install
-            WORKING_DIRECTORY ${CONSOLE_STAND_ALONE_INSTALL_DIR})")
-  endif()
-
 endif(CONSOLE_INSTALL)
 
 ##
@@ -51,20 +38,20 @@ endif(CONSOLE_INSTALL)
 ##
 find_program (MAVEN_EXE mvn DOC "Location of the maven program")
 if (MAVEN_EXE)
-  # the directory where the .war file will be built
-  set(HAWTIO_BUILD_DIR "${CMAKE_BINARY_DIR}/hawtio")
-
-  # create the console .war file
-  add_custom_target(hawtio
-      COMMAND ${MAVEN_EXE} -DbuildDirectory=${HAWTIO_BUILD_DIR} package
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/console/hawtio
-  )
-
-  # install the built war file into the console dir
-  install(
-    # We don't know in advance what the name of the final .war will be because
-    # the war file name depends on the version in the pom.xml. The version 
will change each release
-      CODE "file( GLOB builtwar 
\"${HAWTIO_BUILD_DIR}/dispatch-hawtio-console*.war\" )"
-      CODE "file( INSTALL \${builtwar} DESTINATION 
\"${CONSOLE_INSTALL_DIR}/hawtio\" )"
-  )
+       # the directory where the .war file will be built
+       set(HAWTIO_BUILD_DIR "${CMAKE_BINARY_DIR}/hawtio")
+
+       # create the console .war file
+       add_custom_target(hawtio
+           COMMAND ${MAVEN_EXE} -DbuildDirectory=${HAWTIO_BUILD_DIR} package
+           WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/console/hawtio
+       )
+
+       # install the built war file into the console dir
+       install(
+           # We don't know in advance what the name of the final .war will be 
because
+               # the war file name depends on the version in the pom.xml. The 
version will change each release
+           CODE "file( GLOB builtwar 
\"${HAWTIO_BUILD_DIR}/dispatch-hawtio-console*.war\" )"
+           CODE "file( INSTALL \${builtwar} DESTINATION 
\"${CONSOLE_INSTALL_DIR}/hawtio\" )"
+       )
 endif(MAVEN_EXE)

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0acbc833/console/stand-alone/README.md
----------------------------------------------------------------------
diff --git a/console/stand-alone/README.md b/console/stand-alone/README.md
index ce1a6cc..8af3584 100644
--- a/console/stand-alone/README.md
+++ b/console/stand-alone/README.md
@@ -21,8 +21,7 @@ The stand-alone qpid dispatch console is an html web site 
that monitors and cont
 
 ## To install the console:
 
-  After a build, the console files are normally installed under 
/usr/share/qpid-dispatch/console/stand-alone
-  The 3rd party libraries are installed at during a 'make install' if npm is 
present on the build machine.
+  After a dispatch build the 3rd party libraries need to be installed.
 
   ### To manually install the 3rd party libraries:
     - cd /usr/share/qpid-dispatch/console/stand-alone


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to