Commit e7f9564b authored by kraus's avatar kraus
Browse files

make gcc 4.9.1 happy again

parent 87dd0c61
......@@ -4,6 +4,8 @@
/INSTALL -text
/LICENSE -text
/README -text
bin/findFiles.sh -text
bin/mkver2 -text
cmake/IPPLConfig.cmake.in -text
doc/tex/dingbat.sty -text
doc/tex/error_time.pdf -text svneol=unset#unset
......
#!/bin/bash
find src -regex '.*\.cpp\|.*\.h' -printf '%h/%f ' |perl bin/mkver2
#!/usr/local/bin/perl
######################################################################
#
# A simple script to scan a list of files and pull out
# tag information about each.
#
# Run with a list of files on the command line.
#
#
# Print the name of the array of strings we'll be building.
#
print "const char *ippl_version_log[] = {\n";
#
# Loop over the input files.
#
$filelist = <>;
chop($filelist);
$itemnum = 0;
foreach $file ( split(/ /,$filelist) ) {
# Open the file.
open(FILE,"<$file") || die("Could not open $file!");
# Strip off the directories above src.
$file =~ s,\S+/src/,,;
# Read through the file.
while (<FILE>) {
# If we find the IPPL_VERSION_ID line
# extract the version number and date.
if ( /IPPL_VERSION_ID: \$Id:\s+\S+\s+(\S+)\s+(\S+)/ ) {
# print out the tag line.
print " \"$file $1 $2\",\n";
# count the number of lines.
$itemnum += 1;
}
}
# Close the file.
close(FILE);
}
# print the trailer for the array of strings.
print " \"\"\n";
print "};\n";
# Spit out setting telling how many filenames there are
print "const unsigned int ippl_version_numfiles = $itemnum;\n";
......@@ -27,15 +27,22 @@ EXECUTE_PROCESS (
COMMAND uname -a
OUTPUT_VARIABLE UNAME_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
)
EXECUTE_PROCESS (
COMMAND whoami
OUTPUT_VARIABLE WHOAMI_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
)
SET (IPPL_COMPILE_ARCH \"$ENV{IPPL_ARCH}\")
SET (IPPL_COMPILE_LINE \"${CMAKE_CXX_FLAGS}\")
SET (IPPL_COMPILE_DATE \"${DATE_OUT}\")
SET (IPPL_COMPILE_MACHINE \"${UNAME_OUT}\")
SET (IPPL_COMPILE_OPTIONS \"${CXXDEFINES}\")
SET (IPPL_COMPILE_USER \"adelmann\")
#FIXME: "CVS" version of each file:
#echo `find ${IPPL_ROOT}/src -name '*.cpp' -print` `find ${IPPL_ROOT}/src -name '*.h' -print` | perl ${IPPL_ROOT}/bin/mkver2 >> IpplVersions.h
SET (IPPL_COMPILE_USER \"${WHOAMI_OUT}\")
EXECUTE_PROCESS (
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND bin/findFiles.sh
OUTPUT_VARIABLE IPPL_VERSION_LOG
)
CONFIGURE_FILE (IpplVersions.h.in ${CMAKE_CURRENT_SOURCE_DIR}/IpplVersions.h)
### print the compiler flags #############################
......
......@@ -11,9 +11,7 @@ const char *ippl_compile_date = ${IPPL_COMPILE_DATE};
const char *ippl_compile_machine = ${IPPL_COMPILE_MACHINE};
const char *ippl_compile_options = ${IPPL_COMPILE_OPTIONS};
const char *ippl_compile_user = ${IPPL_COMPILE_USER};
const char *ippl_version_log[] = {
""
};
const unsigned int ippl_version_numfiles = 575;
${IPPL_VERSION_LOG}
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment