Changeset 9

Timestamp:

02/12/06 13:47:01 (3 years ago)

Author:

spog

Message:

added msvc dlls to install.py; added svn revision lookup to makeversion.py; updated COMPILING

Files:

• GtkRadiant/trunk/COMPILING (modified) (3 diffs)
• GtkRadiant/trunk/gen.vcproj (modified) (2 diffs)
• GtkRadiant/trunk/include/aboutmsg.default (deleted)
• GtkRadiant/trunk/install.py (modified) (4 diffs)
• GtkRadiant/trunk/makeversion.py (modified) (2 diffs)
• GtkRadiant/trunk/setup/win32/build.py (modified) (1 diff)
• GtkRadiant/trunk/setup/win32/installer.py (modified) (1 diff)
• GtkRadiant/trunk/setup/win32/msi.py (modified) (1 diff)

GtkRadiant/trunk/COMPILING

@@ -25 +25 @@
-- scons = 0.96 (radiant is built with scons rather than make)
-- python >= 2.3.0 (scons requires python, some build steps use python)
+- svn >= 1.1 (some build steps use svn)
-
-dependencies:
@@ -52 +53 @@
-- visual studio .net 2003
-- microsoft c++ compiler 7.1 (comes with vs.net 2003)
-
+
+
-
-dependencies are prepackaged archives, extract them to the directory above GtkRadiant.sln:
@@ -61 +63 @@
-- http://zerowing.idsoftware.com/files/radiant/developer/1.5/libpng-1.2.5.zip (for imagepng module)
-- http://zerowing.idsoftware.com/files/radiant/developer/1.5/mhash-0.9.1.zip (for q3map2)
+- http://zerowing.idsoftware.com/files/radiant/developer/1.5/msvc_redist.zip (msvc runtime libraries)
-
-build:
-Open GtkRadiant.sln.
- to python.exe (e.g. c:\python23\)
+s to python.exe (e.g. c:\python23\) and svn.exe (e.g. c:\svn\) 
-Hit 'Build > Build Solution' (F7)
-

GtkRadiant/trunk/gen.vcproj

@@ -125 +125 @@
-                                                CommandLine="run_python.bat makeversion.py
-"
-
+;$(InputDir)svn.py;$(InputDir).svn\entriest
-                                                Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h"/>
-                                </FileConfiguration>
@@ -134 +134 @@
-                                                CommandLine="run_python.bat makeversion.py
-"
-include\version.default;$(InputDir)include\aboutmsg.default
+.svn\entries;$(InputDir)include\version.default;$(InputDir)include\aboutmsg.default;$(InputDir)svn.py
-                                                Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h"/>
-                                </FileConfiguration>

GtkRadiant/trunk/install.py

@@ +1 @@
+# Copyright (C) 2001-2006 William Joseph.
+# 
+# This file is part of GtkRadiant.
+# 
+# GtkRadiant is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GtkRadiant is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GtkRadiant; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+"""
+Builds the ./install directory.
+
+Copies files from various locations:
+./setup/data/tools/
+./games/<gamepack>/
+../<library>/<library>.dll
+./include/version.default is used to generate RADIANT_MAJOR and RADIANT_MINOR
+"""
-
-import os
-import shutil
-
-
+
+
+
+
-def copyFile(source, target):
- os.path.isfile(
+Message(os.path.isfile(source), "failed to find file: " + 
-  targetFile = target
-  if os.path.isdir(targetFile):
@@ -17 +47 @@
-    
-def copySvn(source, target):
- os.path.isdir(
+Message(os.path.isdir(source), "failed to find directory: " + 
-  if not os.path.exists(target):
-    os.mkdir(target)
@@ -30 +60 @@
-      
-def copyGame(source, game, target):
- os.path.isdir(
- os.path.isdir(
+Message(os.path.isdir(source), "failed to find directory: " + 
+Message(os.path.isdir(target), "failed to find directory: " + 
-  root = os.path.join(source, os.path.normpath(game[0]))
-  if os.path.exists(root):
@@ -88 +118 @@
-zlib = os.path.normpath(os.path.join(thisDir, "../zlib1-1.2/zlib1.dll"))
-copyFileIfExists(zlib, installRoot)
+
+msvcr71 = os.path.normpath(os.path.join(thisDir, "../msvc_redist/msvcr71.dll"))
+copyFileIfExists(msvcr71, installRoot)
+
+dbghelp = os.path.normpath(os.path.join(thisDir, "../msvc_redist/dbghelp.dll"))
+copyFileIfExists(dbghelp, installRoot)
+
+# create version files
+version = open(os.path.join(thisDir, "include/version.default"), "rt").readline().split(".")
+assertMessage(len(version) == 3, "failed to parse include/version.default")
+open(os.path.join(thisDir, "install/RADIANT_MAJOR"), "wt").write(str(version[1]))
+open(os.path.join(thisDir, "install/RADIANT_MINOR"), "wt").write(str(version[2]))

GtkRadiant/trunk/makeversion.py

@@ -33 +33 @@
-#   otherwise, use environment variable $RADIANT_ABOUTMSG
-# input:
-include/aboutmsg.default
-or file pointed to by $RADIANT_ABOUTMSG if exists
+file pointed to by $RADIANT_ABOUTMSG if exists
+else include/aboutmsg.default
-# ouput:
-#   include/aboutmsg.h
-
-import sys, re, string, os
+
+import svn
-
-def get_version():
@@ -74 +76 @@
-  if ( os.environ.has_key('RADIANT_ABOUTMSG') ):
-    aboutfile = os.environ['RADIANT_ABOUTMSG']
-
-
-
-
-
+
+
+
+
+
+
+
+
-  # optional additional message
-  if ( not append_about is None ):

GtkRadiant/trunk/setup/win32/build.py

@@ -1 +1 @@
-# Copyright (C) 2001-2006 William Joseph.
-# For a list of contributors, see the accompanying CONTRIBUTORS file.
-# 
-# This file is part of GtkRadiant.

GtkRadiant/trunk/setup/win32/installer.py

@@ -1 +1 @@
-# Copyright (C) 2001-2006 William Joseph.
-# For a list of contributors, see the accompanying CONTRIBUTORS file.
-# 
-# This file is part of GtkRadiant.

GtkRadiant/trunk/setup/win32/msi.py

@@ -1 +1 @@
-# Copyright (C) 2001-2006 William Joseph.
-# For a list of contributors, see the accompanying CONTRIBUTORS file.
-# 
-# This file is part of GtkRadiant.