--- C:/d/sdf/fdo/orig/OpenSource_FDO/setenvironment.bat Fri Nov 19 19:44:26 2010
+++ C:/d/sdf/fdo/OpenSource_FDO/setenvironment.bat Mon Nov 07 21:33:02 2011
@@ -1,6 +1,6 @@
-@echo off
+@echo on
rem
rem Copyright (C) 2004-2006 Autodesk, Inc.
rem
rem This library is free software; you can redistribute it and/or
@@ -27,12 +28,12 @@
if "%1" == "x86_amd64" goto setvcvarsall
if "%1" == "x86_ia64" goto setvcvarsall
goto usage
:setvcvarsall
-SET ACTIVENAMECHECK="Microsoft Visual Studio 9"
-SET ACTIVEPATHCHECK="C:\Program Files\Microsoft Visual Studio 9.0\VC"
+SET ACTIVENAMECHECK="Microsoft Visual Studio 10"
+SET ACTIVEPATHCHECK="c:\Program Files\Microsoft Visual Studio 10.0\VC"
if exist %ACTIVEPATHCHECK% goto VSExist
SET ACTIVEPATHCHECK="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC"
if exist %ACTIVEPATHCHECK% goto VSExist
:VSExist
@@ -98,11 +99,11 @@
if not exist "%SDEHOME%" SET SDEHOME=
if exist "%SDEHOME%\bin\sde.dll" SET SDEVER_ARCUNITTEST=92
if exist "%SDEHOME%\bin\sde91.dll" SET SDEVER_ARCUNITTEST=91
SET ACTIVENAMECHECK="7-Zip"
-SET ACTIVEPATHCHECK="C:\Program Files\7-Zip"
+SET ACTIVEPATHCHECK="d:\app\7-Zip"
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
SET ACTIVENAMECHECK="Graphviz"
SET ACTIVEPATHCHECK="C:\Program Files\ATT\Graphviz\bin"
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
@@ -112,23 +113,23 @@
SET ACTIVEPATHCHECK="C:\Program Files\doxygen\bin"
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
if not exist %ACTIVEPATHCHECK% echo OPTIONAL %ACTIVENAMECHECK% documentation package not recognized in the Windows PATH. Update the setenvironment.bat script file with the correct path
SET ACTIVENAMECHECK="GnuWin32 Bison/Sed"
-SET ACTIVEPATHCHECK="c:\Program Files\GnuWin32\bin"
+SET ACTIVEPATHCHECK="c:\d\GnuWin32\bin"
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
if not exist %ACTIVEPATHCHECK% echo OPTIONAL %ACTIVENAMECHECK% package not recognized in the Windows PATH. Update the setenvironment.bat script file with the correct path
SET ACTIVENAMECHECK="Python 2.4"
-SET ACTIVEPATHCHECK=C:\progra~1\Python24
-if exist %ACTIVEPATHCHECK% SET PYTHON_HOME=C:\progra~1\Python24
+SET ACTIVEPATHCHECK=C:\Python24
+if exist %ACTIVEPATHCHECK% SET PYTHON_HOME=%ACTIVEPATHCHECK%
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
if not exist %ACTIVEPATHCHECK% echo OPTIONAL %ACTIVENAMECHECK% package not found. Update the setenvironment.bat script file with the correct path
SET ACTIVENAMECHECK="SWIG 1.3.31"
-SET ACTIVEPATHCHECK=C:\progra~1\swigwin-1.3.31
-if exist %ACTIVEPATHCHECK% SET SWIG_HOME=C:\progra~1\swigwin-1.3.31
+SET ACTIVEPATHCHECK=c:\d\swigwin-1.3.31
+if exist %ACTIVEPATHCHECK% SET SWIG_HOME=%ACTIVEPATHCHECK%
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
if not exist %ACTIVEPATHCHECK% echo OPTIONAL %ACTIVENAMECHECK% package not found. Update the setenvironment.bat script file with the correct path
goto end
--- C:/d/sdf/fdo/orig/OpenSource_FDO/setenvironmentVS10.bat Tue Mar 30 01:20:03 2010
+++ C:/d/sdf/fdo/OpenSource_FDO/setenvironmentVS10.bat Mon Nov 07 22:35:13 2011
@@ -1,6 +1,6 @@
-@echo off
+@echo on
rem
rem Copyright (C) 2004-2006 Autodesk, Inc.
rem
rem This library is free software; you can redistribute it and/or
@@ -75,11 +75,11 @@
if not exist "%FDOGDAL%" SET FDOGDAL=%FDOTHIRDPARTY%\gdal
if not exist "%FDOGDAL%" echo OPTIONAL FDO environment variable FDOGDAL is not set
if not exist "%FDOGDAL%" SET FDOGDAL=
SET ACTIVENAMECHECK="7-Zip"
-SET ACTIVEPATHCHECK="C:\Program Files\7-Zip"
+SET ACTIVEPATHCHECK=d:\app\7-Zip
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
SET ACTIVENAMECHECK="Graphviz"
SET ACTIVEPATHCHECK="C:\Program Files\ATT\Graphviz\bin"
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
@@ -89,23 +89,23 @@
SET ACTIVEPATHCHECK="C:\Program Files\doxygen\bin"
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
if not exist %ACTIVEPATHCHECK% echo OPTIONAL %ACTIVENAMECHECK% documentation package not recognized in the Windows PATH. Update the setenvironment.bat script file with the correct path
SET ACTIVENAMECHECK="GnuWin32 Bison/Sed"
-SET ACTIVEPATHCHECK="c:\Program Files\GnuWin32\bin"
+SET ACTIVEPATHCHECK=c:\d\GnuWin32\bin
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
if not exist %ACTIVEPATHCHECK% echo OPTIONAL %ACTIVENAMECHECK% package not recognized in the Windows PATH. Update the setenvironment.bat script file with the correct path
SET ACTIVENAMECHECK="Python 2.4"
-SET ACTIVEPATHCHECK=C:\progra~1\Python24
-if exist %ACTIVEPATHCHECK% SET PYTHON_HOME=C:\progra~1\Python24
+SET ACTIVEPATHCHECK=C:\Python24
+if exist %ACTIVEPATHCHECK% SET PYTHON_HOME=%ACTIVEPATHCHECK%
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
if not exist %ACTIVEPATHCHECK% echo OPTIONAL %ACTIVENAMECHECK% package not found. Update the setenvironment.bat script file with the correct path
SET ACTIVENAMECHECK="SWIG 1.3.31"
-SET ACTIVEPATHCHECK=C:\progra~1\swigwin-1.3.31
-if exist %ACTIVEPATHCHECK% SET SWIG_HOME=C:\progra~1\swigwin-1.3.31
+SET ACTIVEPATHCHECK=c:\d\swigwin-1.3.31
+if exist %ACTIVEPATHCHECK% SET SWIG_HOME=%ACTIVEPATHCHECK%
if exist %ACTIVEPATHCHECK% set PATH=%PATH%;%ACTIVEPATHCHECK%
if not exist %ACTIVEPATHCHECK% echo OPTIONAL %ACTIVENAMECHECK% package not found. Update the setenvironment.bat script file with the correct path
goto end
--- C:/d/sdf/fdo/orig/OpenSource_FDO/Fdo/Python/Resource/FdoWrapper.rc Wed Feb 16 18:43:18 2011
+++ C:/d/sdf/fdo/OpenSource_FDO/Fdo/Python/Resource/FdoWrapper.rc Mon Nov 07 22:37:54 2011
@@ -5,11 +5,12 @@
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+//#include "afxres.h"
+#include "winresrc.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
--- C:/d/sdf/fdo/orig/OpenSource_FDO/Fdo/Python/Swig/Fdo/FdoIncludes.i Wed Jan 06 04:06:08 2010
+++ C:/d/sdf/fdo/OpenSource_FDO/Fdo/Python/Swig/Fdo/FdoIncludes.i Mon Nov 07 22:57:32 2011
@@ -432,11 +432,14 @@
%include "Fdo/Schema/SchemaException.h"
%include "Fdo/Schema/ClassDefinition.h"
%include "Fdo/Schema/AutogenerationException.h"
%include "Fdo/Schema/Class.h"
+
+%ignore FdoClassCapabilities::Set;
%include "Fdo/Schema/ClassCapabilities.h"
+
%include "Fdo/Schema/ClassCollection.h"
%include "Fdo/Schema/ClassType.h"
%include "Fdo/Schema/DataPropertyDefinition.h"
%include "Fdo/Schema/DataPropertyDefinitionCollection.h"
%include "Fdo/Schema/DataType.h"
--- C:/d/sdf/fdo/orig/OpenSource_FDO/Thirdparty/apache/xalan/projects/Win32/Res/AllInOne/AllInOne.rc Wed Mar 24 22:43:20 2010
+++ C:/d/sdf/fdo/OpenSource_FDO/Thirdparty/apache/xalan/projects/Win32/Res/AllInOne/AllInOne.rc Mon Nov 07 22:37:54 2011
@@ -5,11 +5,12 @@
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+//#include "afxres.h"
+#include "winresrc.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
|
Комментариев нет:
Отправить комментарий