Changeset 7ec3dd1 in nscp for build

Timestamp:

06/16/11 23:00:44 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

e11d494

Parents:

3bdaf18

Message:

various fixes and changes here and there
Mainly build related (been trying to fix symbol dumper problems) as well as tweaks for the up-coming "nightly release")

Location:

build

Files:

• batch/batch_build_win.bat (modified) (3 diffs)
• cmake/FindGoogleBreakpad.cmake (modified) (2 diffs)
• cmake/functions.cmake (modified) (1 diff)
• cmake/module.cmake (modified) (1 diff)
• cmake/wix.cmake (modified) (2 diffs)
• python/VersionHandler.py (added)
• python/__init__.py (added)
• python/postbuild.py (added)
• python/version.hpp (deleted)
• python/version.py (modified) (1 diff)

build/batch/batch_build_win.bat

@@ -10 +10 @@
 
 title Generating x64 
-cmake -G "Visual Studio 8 2005 Win64" ../../trunk
-cmake -G "Visual Studio 8 2005 Win64" ../../trunk
+cmake -D INCREASE_BUILD=1 -G "Visual Studio 8 2005 Win64" ../../trunk
+cmake -D INCREASE_BUILD=0 -G "Visual Studio 8 2005 Win64" ../../trunk
 if %ERRORLEVEL% == 1 goto :error
 
@@ -22 +22 @@
 if %ERRORLEVEL% == 1 goto :error
 
+title Postbuild x64
+postbuild.py
+if %ERRORLEVEL% == 1 goto :error
+
 cd %ROOT%\w32
 if %ERRORLEVEL% == 1 goto :error
 
 title Generating w32
-cmake -G "Visual Studio 8 2005" ../../trunk
-cmake -G "Visual Studio 8 2005" ../../trunk
+cmake -D INCREASE_BUILD=0 -G "Visual Studio 8 2005" ../../trunk
+cmake -D INCREASE_BUILD=0 -G "Visual Studio 8 2005" ../../trunk
 if %ERRORLEVEL% == 1 goto :error
 
@@ -38 +42 @@
 if %ERRORLEVEL% == 1 goto :error
 
+title Postbuild w32
+postbuild.py
+if %ERRORLEVEL% == 1 goto :error
+
+title Done!
+
 exit /b 0
 goto :eof

build/cmake/FindGoogleBreakpad.cmake

@@ -28 +28 @@
 ENDIF(NOT BREAKPAD_LIBRARY_SUFFIX_DEBUG)
 
-MESSAGE(STATUS "Breakpad config: ${BREAKPAD_LIBRARY_PREFIX}...${BREAKPAD_LIBRARY_SUFFIX}, ${BREAKPAD_LIBRARY_PREFIX_DEBUG}...${BREAKPAD_LIBRARY_SUFFIX_DEBUG}" )
+MESSAGE("Breakpad config: ${BREAKPAD_LIBRARY_PREFIX}...${BREAKPAD_LIBRARY_SUFFIX}, ${BREAKPAD_LIBRARY_PREFIX_DEBUG}...${BREAKPAD_LIBRARY_SUFFIX_DEBUG}" )
 SET(BREAKPAD_FOUND TRUE)
 FOREACH(COMPONENT ${GoogleBreakpad_FIND_COMPONENTS})
     string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-  FIND_LIBRARY(BREAKPAD_${UPPERCOMPONENT}_LIBRARY_RELEASE NAMES ${BREAKPAD_LIBRARY_PREFIX}${COMPONENT}${BREAKPAD_LIBRARY_SUFFIX})
-  FIND_LIBRARY(BREAKPAD_${UPPERCOMPONENT}_LIBRARY_DEBUG NAMES ${BREAKPAD_LIBRARY_PREFIX_DEBUG}${COMPONENT}${BREAKPAD_LIBRARY_SUFFIX_DEBUG})
+  FIND_LIBRARY(BREAKPAD_${UPPERCOMPONENT}_LIBRARY_RELEASE 
+    NAMES ${BREAKPAD_LIBRARY_PREFIX}${COMPONENT}${BREAKPAD_LIBRARY_SUFFIX})
+  FIND_LIBRARY(BREAKPAD_${UPPERCOMPONENT}_LIBRARY_DEBUG 
+    NAMES ${BREAKPAD_LIBRARY_PREFIX_DEBUG}${COMPONENT}${BREAKPAD_LIBRARY_SUFFIX_DEBUG})
   IF(BREAKPAD_${UPPERCOMPONENT}_LIBRARY_RELEASE AND BREAKPAD_${UPPERCOMPONENT}_LIBRARY_DEBUG)
     SET(BREAKPAD_${UPPERCOMPONENT}_FOUND TRUE)
@@ -44 +46 @@
   ENDIF(BREAKPAD_${UPPERCOMPONENT}_LIBRARY_RELEASE AND BREAKPAD_${UPPERCOMPONENT}_LIBRARY_DEBUG)
 ENDFOREACH(COMPONENT)
+IF(BREAKPAD_FOUND)
+  MESSAGE("Looking for dump-symbols in: ${BREAKPAD_INCLUDE_DIR}/tools/windows/binaries" )
+  FIND_PROGRAM(BREAKPAD_DUMPSYMS_EXE 
+    dump_syms.exe NAMES dump_syms dumpsyms
+    PATHS ENV PATH ${BREAKPAD_INCLUDE_DIR}/tools/windows/binaries
+    )
+  MESSAGE("Looking for dump-symbols in: ${BREAKPAD_INCLUDE_DIR}/tools/windows/binaries: ${BREAKPAD_DUMPSYMS_EXE}" )
+  IF(BREAKPAD_DUMPSYMS_EXE)
+    SET(BREAKPAD_DUMPSYMS_EXE_FOUND TRUE)
+  ELSE(BREAKPAD_DUMPSYMS_EXE)
+    SET(BREAKPAD_DUMPSYMS_EXE_FOUND FALSE)
+    SET(BREAKPAD_FOUND FALSE)
+  ENDIF(BREAKPAD_DUMPSYMS_EXE)
+ELSE(BREAKPAD_FOUND)
+  MESSAGE("NOT looking for dump-symbols in: ${BREAKPAD_INCLUDE_DIR}/tools/windows/binaries" )
+ENDIF(BREAKPAD_FOUND)

build/cmake/functions.cmake

@@ -18 +18 @@
   ENDFOREACH(_CURRENT_MODULE ${TMP_LIST})
 ENDMACRO(LOAD_SECTIONS)
+
+
+MACRO(copy_single_file alias src destDir)
+  GET_FILENAME_COMPONENT(TARGET ${src} NAME)
+  SET(source_file ${CMAKE_CURRENT_SOURCE_DIR}/${src})
+  IF(${destDir} STREQUAL ".")
+    SET(target_file ${CMAKE_BINARY_DIR}/${TARGET})
+  ELSE(${destDir} STREQUAL ".")
+    SET(target_file ${CMAKE_BINARY_DIR}/${destDir}/${TARGET})
+  ENDIF(${destDir} STREQUAL ".")
+  #message(STATUS " - Copying ${source_file} to ${target_file}...")
+  ADD_CUSTOM_COMMAND(OUTPUT ${target_file}
+    DEPENDS ${source_file}
+    COMMAND cmake 
+    ARGS -E copy "${source_file}" "${target_file}"
+    OUTPUT ${target_file}
+    COMMENT Copying ${source_file} to ${target_file}
+    )
+  ADD_CUSTOM_TARGET(${TARGET}_${alias} ALL DEPENDS ${target_file})
+  SET_TARGET_PROPERTIES(${TARGET}_${alias} PROPERTIES FOLDER "files/${alias}")
+  INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${destDir} TYPE EXECUTABLE FILES \"${source_file}\")")
+ENDMACRO(copy_single_file)
+

build/cmake/module.cmake

@@ -5 +5 @@
 
 SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER ${MODULE_SUBFOLDER})
+#IF(BREAKPAD_FOUND)
+# ADD_CUSTOM_COMMAND(TARGET ${TARGET} 
+#   POST_BUILD 
+#   COMMAND ${BREAKPAD_DUMPSYMS_EXE} ${BUILD_TARGET_LIB_PATH}/${TARGET}.pdb > ${BUILD_TARGET_LIB_PATH}/${TARGET}.sym
+#   COMMENT Building symbols into ${BUILD_TARGET_LIB_PATH}/${TARGET}.sym
+#   )
+#ENDIF(BREAKPAD_FOUND)
 
 INSTALL(TARGETS ${TARGET} LIBRARY DESTINATION ${MODULE_SUBFOLDER})
-INSTALL(CODE "SET(PDB_FULL_PATH ${BUILD_TARGET_LIB_PATH}/${TARGET}.pdb)")
-INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${MODULE_SUBFOLDER} TYPE EXECUTABLE FILES \${PDB_FULL_PATH})")
-
+#IF(BREAKPAD_FOUND)
+# INSTALL(CODE "SET(PDB_FULL_PATH ${BUILD_TARGET_LIB_PATH}/${TARGET}.pdb)")
+# INSTALL(CODE "SET(SYM_FULL_PATH ${BUILD_TARGET_LIB_PATH}/${TARGET}.sym)")
+# INSTALL(CODE "ADD_CUSTOM_COMMAND(OUTPUT \${SYM_FULL_PATH} COMMAND ${BREAKPAD_DUMPSYMS_EXE} \${PDB_FULL_PATH} > \${SYM_FULL_PATH})")
+# INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${MODULE_SUBFOLDER} TYPE EXECUTABLE FILES \${SYM_FULL_PATH})")
+#ENDIF(BREAKPAD_FOUND)

build/cmake/wix.cmake

@@ -194 +194 @@
         OUTPUT    ${_target}
         COMMAND   ${WIX_LIGHT}
-        ARGS      ${WIX_LINK_FLAGS_A} 
+        ARGS      ${WIX_LINK_FLAGS_A}
+              -b ${CMAKE_CURRENT_SOURCE_DIR}
               -ext WixUIExtension 
               -ext WixFirewallExtension 
@@ -224 +225 @@
     SET(WIX_OBJ_LIST)
     WIX_COMPILE("${_sources}" WIX_OBJ_LIST "${_dependencies}")
-    WIX_LINK(${_target}.msi WIX_OBJ_LIST "${_loc_files}")
-    ADD_CUSTOM_TARGET(${_target} 
-      DEPENDS ${_target}.msi
+    SET(TNAME "${_target}-${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}-${VERSION_ARCH}.msi")
+    WIX_LINK(${TNAME} WIX_OBJ_LIST "${_loc_files}")
+    ADD_CUSTOM_TARGET(${_target}_installer 
+      ALL
+      DEPENDS ${TNAME}
       SOURCES ${_sources}
       )

build/python/version.py

@@ -5 +5 @@
 from datetime import date
 from optparse import OptionParser
+from VersionHandler import VersionHandler
 
-class Version:
-  def __init__(self, file):
-    self.file = file
-    self.major = 0
-    self.minor = 0
-    self.revision = 0
-    self.build = 1
-    self.touch()
-    
-  def read(self):
-    try:
-      f = open(self.file, 'r')
-      lines = f.readlines()
-      f.close()
-      for line in lines:
-        self.readline(line)
-      
-        #if line.find(' PRODUCTVER ') != -1:
-        # m = re.search('.*(\d),(\d),(\d),(\d).*', line)
-        # print 'Parsed: %s as %s'%(line, m.groups())
-        # return (int(m.group(1)), int(m.group(2)), int(m.group(3)), int(m.group(4)))
-    except IOError as e:
-      print 'File not found: %s (%s)'%(self.file, e)
-      sys.exit(1)
-    
-  def readline(self, line):
-    line = line.strip('\r\n\t ')
-    if len(line) == 0:
-      return
-    try:
-      m = re.search('(.*)=(.*)$', line)
-      if not m:
-        print 'Failed to parse line: %s'%(line.strip('\n\t '))
-        return
-      self.set(m.group(1), m.group(2))
-    except IndexError as e:
-      print 'Failed to parse line: %s (%s)'%(line.strip('\n\t '),e)
+parser = OptionParser()
+parser.add_option("-f", "--file", dest="filename",
+          help="File to update version in", metavar="FILE")
+parser.add_option("-g", "--generate-hpp", dest="targetHPP",
+          help="Generate a HPP file")
+parser.add_option("-c", "--create", action="store_true", dest="create",
+          help="Create a new file")
+parser.add_option("-d", "--display", action="store_true", dest="display",
+          help="Display the current version")
+parser.add_option("-u", "--update",
+          dest="update", default='build',
+          help="Update a file (major, minor, revision, build)")
 
-  def set(self,k,v):
-    if k == 'version':
-      m = re.search('.*(\d).(\d).(\d).*', v)
-      (self.major, self.minor, self.revision) = [int(e) for e in m.groups()]
-    elif k == 'build':
-      self.build = int(v)
-    elif k == 'date':
-      self.date = v
-      
-  def touch(self):
-    today = date.today()
-    self.date = today.isoformat()
-    
-  def version(self):
-    return '%d.%d.%d.%d'%(self.major, self.minor, self.revision, self.build)
-    
-  def __str__(self):
-    return 'version: %s, date %s'%(self.version(), self.date)
+(options, args) = parser.parse_args()
+version = None
+if options.filename and options.create:
+  version = VersionHandler(options.filename)
+  version.create()
+elif options.filename and options.update:
+  version = VersionHandler(options.filename)
+  version.read()
+  version.increment(options.update)
+  version.touch()
+  version.write()
+else:
+  parser.print_help()
 
-  def __repr__(self):
-    return 'version: %s, date %s'%(self.version(), self.date)
-
-  def increment(self, key):
-    if key == 'build':
-      self.build += 1
-    elif key == 'revision':
-      self.revision += 1
-      self.build = 0
-    elif key == 'minor':
-      self.minor += 1
-      self.revision = 0
-      self.build = 0
-    elif key == 'major':
-      self.major += 1
-      self.minor = 0
-      self.revision = 0
-      self.build = 0
-    
-  def print_version(self):
-    print '%d.%d.%d.%d'%(self.major, self.minor, self.revision, self.build)
-  
-  def write_hpp(self, file):
-    f = open(file, 'w')
-    (ignored, filename) = os.path.split(file)
-    name = filename.upper().replace('.', '_')
-
-    f.write('#ifndef %s\n'%name)
-    f.write('#define %s\n'%name)
-    
-    f.write('#define PRODUCTVER     %d,%d,%d,%d\n'%(self.major, self.minor, self.revision, self.build))
-    f.write('#define STRPRODUCTVER  "%d,%d,%d,%d"\n'%(self.major, self.minor, self.revision, self.build))
-    f.write('#define STRPRODUCTDATE "%s"\n'%(self.date))
-    
-    f.write('#endif // %s\n'%name)
-    f.close()
-
-def run():
-  parser = OptionParser()
-  parser.add_option("-f", "--file", dest="filename",
-            help="File to update version in", metavar="FILE")
-  parser.add_option("-g", "--generate-hpp", dest="targetHPP",
-            help="Generate a HPP file")
-  parser.add_option("-c", "--create", action="store_true", dest="create",
-            help="Create a new file")
-  parser.add_option("-d", "--display", action="store_true", dest="display",
-            help="Display the current version")
-  parser.add_option("-u", "--update",
-            dest="update", default='build',
-            help="Update a file (major, minor, revision, build)")
-
-  (options, args) = parser.parse_args()
-  version = None
-  if options.filename and options.create:
-    version = Version(options.filename)
-    version.create()
-  elif options.filename and options.update:
-    version = Version(options.filename)
-    version.read()
-    version.increment(options.update)
-  else:
-    parser.print_help()
-
-  if options.targetHPP:
-    version.write_hpp(options.targetHPP)
-  if options.display:
-    version.print_version()
+if options.targetHPP:
+  version.write_hpp(options.targetHPP)
+if options.display:
+  version.print_version()
 
     
-run()