Unify GL specs.

[apitrace] / SConstruct

diff --git a/SConstruct b/SConstruct
index 18d8f874afd2c7adc50e3bbb9daf9f227a09ea9c..9adf118bb298a54947a07d6b589dc464ac6171ac 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -1,19 +1,25 @@
 #############################################################################
 #
 # Copyright 2008-2009 VMware, Inc.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
 #############################################################################
 
@@ -21,6 +27,7 @@ import os
 import os.path
 import platform
 import sys
+import time
 
 _platform_map = {
     'freebsd': 'freebsd',
@@ -62,7 +69,7 @@ Help(vars.GenerateHelpText(env))
 
 Export(['env'])
 
-env.Tool(env['toolchain'], toolpath = ['scons'])
+env.Tool(env['toolchain'])
 
 env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
 env['msvc'] = env['CC'] == 'cl'
@@ -180,7 +187,7 @@ env.Prepend(LIBS = [
 
 SConscript('zlib/SConscript')
 
-env.Tool('dxsdk', toolpath = ['scons'])
+env.Tool('dxsdk')
 
 conf = Configure(env)
 has_d3d7 = conf.CheckCXXHeader('ddraw.h')
@@ -208,6 +215,7 @@ if has_d3d7 and False:
             'ddraw.def',
             'ddraw.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -226,6 +234,7 @@ if has_d3d8:
             'd3d8.def',
             'd3d8.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -244,6 +253,7 @@ if has_d3d9:
             'd3d9.def',
             'd3d9.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -262,6 +272,7 @@ if has_d3d10:
             'd3d10.def',
             'd3d10.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -280,6 +291,7 @@ if has_d3d10_1:
             'd3d10_1.def',
             'd3d10_1.cpp',
             'log.cpp',
+            'os_win32.cpp',
         ]
     )
 
@@ -297,6 +309,7 @@ opengl32 = env.SharedLibrary(
         'opengl32.def',
         'opengl32.cpp',
         'log.cpp',
+        'os_win32.cpp',
     ]
 )
 
@@ -306,12 +319,12 @@ env.Tool('packaging')
 
 zip = env.Package(
     NAME           = 'apitrace',
-    VERSION        = '0.3',
+    VERSION        = time.strftime('%Y%m%d'),
     PACKAGEVERSION = 0,
     PACKAGETYPE    = 'zip',
     LICENSE        = 'lgpl',
     SUMMARY        = 'Tool to trace Direct3D & OpenGL API calls from applications.',
-    SOURCE_URL     = 'http://cgit.freedesktop.org/~jrfonseca/apitrace/',
+    SOURCE_URL     = 'http://code.google.com/p/jrfonseca/source/browse?repo=apitrace',
     source = [
         'README',
         'd3d8.dll',
@@ -322,4 +335,4 @@ zip = env.Package(
     ],
 )
 
-env.Alias('zip', zip)
+env.Alias('dist', zip)