[brlcad-commits] SF.net SVN: brlcad:[40161] brlcad/branches/cmake

[<sta...@us...>]

Revision: 40161
          http://brlcad.svn.sourceforge.net/brlcad/?rev=40161&view=rev
Author:   starseeker
Date:     2010-08-13 21:23:25 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
Put hostname and username into C code, use FILE(WRITE for PATH, and leave the two working ones for now (also the two that must be set/updated at build time.

Modified Paths:
--------------
    brlcad/branches/cmake/CMakeLists.txt

Added Paths:
-----------
    brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in
    brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in

Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt	2010-08-13 20:52:15 UTC (rev 40160)
+++ brlcad/branches/cmake/CMakeLists.txt	2010-08-13 21:23:25 UTC (rev 40161)
@@ -138,7 +138,7 @@
 SET(CONFIG_TIMESTAMP_FILE "${BRLCAD_BINARY_DIR}/include/conf/CONFIG_TIMESTAMP")
 FILE(MAKE_DIRECTORY "${BRLCAD_BINARY_DIR}/include")
 FILE(MAKE_DIRECTORY "${BRLCAD_BINARY_DIR}/include/conf")
-configure_file(${CONFIG_H_FILE} ${BRLCAD_CMAKE_DIR}/test_srcs/time.c.in ${CMAKE_BINARY_DIR}/CMakeTmp/time.c)
+configure_file(${BRLCAD_CMAKE_DIR}/test_srcs/time.c.in ${CMAKE_BINARY_DIR}/CMakeTmp/time.c)
 TRY_RUN(TIME_RESULT TIME_COMPILED 
   ${CMAKE_BINARY_DIR}/CMakeTmp
   ${CMAKE_BINARY_DIR}/CMakeTmp/time.c
@@ -935,23 +935,23 @@
 # Make the include/conf files build time generated, but most don't work - quoting is eating the " characters 
 # Need to replace these scripts with some kind of portable C code which is compiled and run instead,
 # see http://www.cmake.org/Wiki/CMake_FAQ#How_do_I_generate_an_executable.2C_then_use_the_executable_to_generate_a_file.3F
+configure_file(${BRLCAD_CMAKE_DIR}/test_srcs/report_hostname.c.in ${CMAKE_BINARY_DIR}/CMakeTmp/report_hostname.c)
+TRY_RUN(TIME_RESULT TIME_COMPILED 
+  ${CMAKE_BINARY_DIR}/CMakeTmp
+  ${CMAKE_BINARY_DIR}/CMakeTmp/report_hostname.c
+  OUTPUT_VARIABLE COMPILEMESSAGES)
 
+configure_file(${BRLCAD_CMAKE_DIR}/test_srcs/report_username.c.in ${CMAKE_BINARY_DIR}/CMakeTmp/report_username.c)
+TRY_RUN(TIME_RESULT TIME_COMPILED 
+  ${CMAKE_BINARY_DIR}/CMakeTmp
+  ${CMAKE_BINARY_DIR}/CMakeTmp/report_username.c
+  OUTPUT_VARIABLE COMPILEMESSAGES)
+
+
+FILE(WRITE ${BRLCAD_BINARY_DIR}/include/conf/PATH "\"${BRLCAD_PREFIX}\"") 
+
+
 ADD_CUSTOM_COMMAND(
-   OUTPUT ${BRLCAD_BINARY_DIR}/include/conf/HOST
-   COMMAND /bin/echo '\"`hostname`\"' > ${BRLCAD_BINARY_DIR}/include/conf/HOST
-   )
-ADD_CUSTOM_TARGET(writehostname ALL DEPENDS ${BRLCAD_BINARY_DIR}/include/conf/HOST) 
-ADD_CUSTOM_COMMAND(
-   OUTPUT ${BRLCAD_BINARY_DIR}/include/conf/PATH
-   COMMAND /bin/echo '\"${BRLCAD_PREFIX}\"' > ${BRLCAD_BINARY_DIR}/include/conf/PATH
-   )
-ADD_CUSTOM_TARGET(writepath ALL DEPENDS ${BRLCAD_BINARY_DIR}/include/conf/PATH) 
-ADD_CUSTOM_COMMAND(
-   OUTPUT ${BRLCAD_BINARY_DIR}/include/conf/USER
-   COMMAND /bin/echo '\"`whoami`\"' > ${BRLCAD_BINARY_DIR}/include/conf/USER
-   )
-ADD_CUSTOM_TARGET(writeusername ALL DEPENDS ${BRLCAD_BINARY_DIR}/include/conf/USER) 
-ADD_CUSTOM_COMMAND(
    OUTPUT ${BRLCAD_BINARY_DIR}/include/conf/DATE
    COMMAND LANG=C date +'\"%a, %d %b %Y %H:%M:%S %z\"' > ${BRLCAD_BINARY_DIR}/include/conf/DATE
    )

Added: brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in
===================================================================
--- brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in	                        (rev 0)
+++ brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in	2010-08-13 21:23:25 UTC (rev 40161)
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include <unistd.h>
+#define chararraysize 2048
+int main(void) {
+  int i;
+  char hostname[chararraysize];
+  char username[chararraysize];
+  FILE *outfp = NULL;
+
+  hostname[chararraysize - 1] = "\0";
+  gethostname(hostname, chararraysize - 1);
+  outfp = fopen("${BRLCAD_BINARY_DIR}/include/conf/HOST", "w");
+  fprintf(outfp, "\"%s\"", hostname);
+  fclose(outfp);
+  return 0;
+}


Property changes on: brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in
===================================================================
--- brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in	                        (rev 0)
+++ brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in	2010-08-13 21:23:25 UTC (rev 40161)
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include <unistd.h>
+#ifdef WIN32
+   #define USERVAR "USERNAME"
+#else
+   #define USERVAR "USER"
+#endif
+#define chararraysize 2048
+int main(void) {
+  int i;
+  FILE *outfp = NULL;
+  outfp = fopen("${BRLCAD_BINARY_DIR}/include/conf/USER", "w");
+  fprintf(outfp, "\"%s\"", getenv(USERVAR));
+  fclose(outfp);
+  return 0;
+}


Property changes on: brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.