[Mobies-commit] [commit] r4099 - in UDM/trunk: Projects/Win32/VC10/src Projects/Win32/VC10/src/UdmPOI Projects/Win32/VC10/src/UdmSwig WiX/Udm_bin include judm/src/UdmSwigLight/edu/vanderbilt/isis/udm src/UdmPOI
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Wed Sep 5 11:56:10 CDT 2012
Author: ksmyth
Date: Wed Sep 5 11:56:06 2012
New Revision: 4099
Log:
UdmSwig x64 (for judm)
Added:
UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc
UDM/trunk/Projects/Win32/VC10/src/UdmSwig/resource.h
Modified:
UDM/trunk/Projects/Win32/VC10/src/Udm.sln
UDM/trunk/Projects/Win32/VC10/src/UdmPOI/UdmPOI.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.vcxproj
UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
UDM/trunk/include/UdmCintSwig.h
UDM/trunk/judm/src/UdmSwigLight/edu/vanderbilt/isis/udm/UdmFactory.java
UDM/trunk/src/UdmPOI/UdmPOI.cpp
Modified: UDM/trunk/Projects/Win32/VC10/src/Udm.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm.sln Tue Aug 28 14:09:11 2012 (r4098)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm.sln Wed Sep 5 11:56:06 2012 (r4099)
@@ -316,9 +316,11 @@
{AA870453-DBEA-4162-9699-563A975E5A84}.Debug|Win32.ActiveCfg = Debug|Win32
{AA870453-DBEA-4162-9699-563A975E5A84}.Debug|Win32.Build.0 = Debug|Win32
{AA870453-DBEA-4162-9699-563A975E5A84}.Debug|x64.ActiveCfg = Debug|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Debug|x64.Build.0 = Debug|x64
{AA870453-DBEA-4162-9699-563A975E5A84}.Release|Win32.ActiveCfg = Release|Win32
{AA870453-DBEA-4162-9699-563A975E5A84}.Release|Win32.Build.0 = Release|Win32
{AA870453-DBEA-4162-9699-563A975E5A84}.Release|x64.ActiveCfg = Release|x64
+ {AA870453-DBEA-4162-9699-563A975E5A84}.Release|x64.Build.0 = Release|x64
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
@@ -328,9 +330,11 @@
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.Debug|Win32.ActiveCfg = Debug|Win32
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.Debug|Win32.Build.0 = Debug|Win32
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.Debug|x64.ActiveCfg = Debug|x64
+ {51AA434D-E6EE-494B-9DA6-85B511B019FC}.Debug|x64.Build.0 = Debug|x64
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.Release|Win32.ActiveCfg = Release|Win32
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.Release|Win32.Build.0 = Release|Win32
{51AA434D-E6EE-494B-9DA6-85B511B019FC}.Release|x64.ActiveCfg = Release|x64
+ {51AA434D-E6EE-494B-9DA6-85B511B019FC}.Release|x64.Build.0 = Release|x64
{B1C6E905-B4C5-4653-9D17-FA52EDA2991B}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
{B1C6E905-B4C5-4653-9D17-FA52EDA2991B}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
{B1C6E905-B4C5-4653-9D17-FA52EDA2991B}.BootUdmCompile Debug|x64.Build.0 = Debug|x64
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmPOI/UdmPOI.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmPOI/UdmPOI.vcxproj Tue Aug 28 14:09:11 2012 (r4098)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPOI/UdmPOI.vcxproj Wed Sep 5 11:56:06 2012 (r4099)
@@ -54,6 +54,7 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm_x64.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
@@ -62,18 +63,15 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\Xerces-c.props" />
+ <Import Project="..\..\..\..\..\Udm_x64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
</PropertyGroup>
@@ -101,7 +99,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;UDM_DYNAMIC_LINKING;UDM_DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -136,7 +134,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;UDM_DYNAMIC_LINKING;UDM_DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<PrecompiledHeader>
Added: UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added) and UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.rc Wed Sep 5 11:56:06 2012 (r4099) differ
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.vcxproj Tue Aug 28 14:09:11 2012 (r4098)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmSwig/UdmSwig.vcxproj Wed Sep 5 11:56:06 2012 (r4099)
@@ -59,6 +59,7 @@
<Import Project="..\Java.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\zlib.props" />
+ <Import Project="..\..\..\..\..\Udm_x64.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
@@ -73,20 +74,17 @@
<Import Project="..\Java.props" />
<Import Project="..\Xerces-c.props" />
<Import Project="..\zlib.props" />
+ <Import Project="..\..\..\..\..\Udm_x64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\..\Build\Win32\VC10\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)obj\src\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
@@ -150,7 +148,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;UDMCINTJNI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -168,7 +166,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UmlD.lib;GOCLd.lib;UdmOcld.lib;jvm.lib;jawt.lib;UdmPOID.lib;Xalan-C_1d.lib;xerces-c_2.lib;UdmBaseD.lib;UdmDomD.lib;UdmUtilD.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -243,7 +240,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -262,10 +259,8 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>Uml.lib;GOCL.lib;UdmOcl.lib;jvm.lib;jawt.lib;UdmPOI.lib;xerces-c_2.lib;UdmBase.lib;UdmDom.lib;UdmUtil.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -318,6 +313,12 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="UdmSwig.rc" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Added: UDM/trunk/Projects/Win32/VC10/src/UdmSwig/resource.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmSwig/resource.h Wed Sep 5 11:56:06 2012 (r4099)
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by UdmSwig.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Modified: UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_bin/Udm_bin.wxs Tue Aug 28 14:09:11 2012 (r4098)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs Wed Sep 5 11:56:06 2012 (r4099)
@@ -15,6 +15,7 @@
<!-- DIRECTORY STRUCTURE -->
<!-- =========================================================== -->
<Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id='$(var.SystemFolderNative)' Name='$(var.SystemFolderNative)'/>
<Directory Id='$(var.ProgramFilesNativeFolder)'>
<Directory Id='ISIS' Name='ISIS'>
<Directory Id='INSTALLDIR' Name='Udm'>
@@ -27,6 +28,14 @@
</Directory>
</Directory>
+ <?if $(sys.BUILDARCH)=x64?>
+ <DirectoryRef Id="$(var.SystemFolderNative)">
+ <Component>
+ <File Source="..\Build\x64\VC10\Release\UdmSwig.dll"/>
+ </Component>
+ </DirectoryRef>
+ <?endif?>
+
<DirectoryRef Id="bin">
<?if $(sys.BUILDARCH)=x64?>
<Component>
Modified: UDM/trunk/include/UdmCintSwig.h
==============================================================================
--- UDM/trunk/include/UdmCintSwig.h Tue Aug 28 14:09:11 2012 (r4098)
+++ UDM/trunk/include/UdmCintSwig.h Wed Sep 5 11:56:06 2012 (r4099)
@@ -39,6 +39,10 @@
#include <vector>
#include "cint_string.h"
+#ifdef UDM_DYNAMIC_LINKING
+#define NO_ANTLR
+#endif
+
using namespace std;
@@ -123,17 +127,24 @@
class UdmPseudoObject
{
-
- unsigned long ob_id;
+public:
+#if defined(_M_AMD64)
+ typedef __int64 ob_id_type;
+#else
+ typedef unsigned long ob_id_type;
+#endif
+
+private:
+ ob_id_type ob_id;
unsigned long dn_id;
public:
- unsigned long _ob_id() const;
+ ob_id_type _ob_id() const;
unsigned long _dn_id() const;
UdmPseudoObject(); //NULL object
- UdmPseudoObject(unsigned long dn_id, unsigned long ob_id);
+ UdmPseudoObject(unsigned long dn_id, ob_id_type ob_id);
UdmPseudoObject& operator=(const UdmPseudoObject& frm);
// Himanshu: Adding a equals operator for UdmPseudoObject
bool operator ==(const UdmPseudoObject& to);
Modified: UDM/trunk/judm/src/UdmSwigLight/edu/vanderbilt/isis/udm/UdmFactory.java
==============================================================================
--- UDM/trunk/judm/src/UdmSwigLight/edu/vanderbilt/isis/udm/UdmFactory.java Tue Aug 28 14:09:11 2012 (r4098)
+++ UDM/trunk/judm/src/UdmSwigLight/edu/vanderbilt/isis/udm/UdmFactory.java Wed Sep 5 11:56:06 2012 (r4099)
@@ -26,7 +26,7 @@
private String packagePath;
protected Diagram metaDiagram;
protected UdmPseudoDataNetwork dataNetwork;
-
+
private void findSwigDll() {
String judm_path = null;
String swig_lib = System.mapLibraryName("UdmSwig");
Modified: UDM/trunk/src/UdmPOI/UdmPOI.cpp
==============================================================================
--- UDM/trunk/src/UdmPOI/UdmPOI.cpp Tue Aug 28 14:09:11 2012 (r4098)
+++ UDM/trunk/src/UdmPOI/UdmPOI.cpp Wed Sep 5 11:56:06 2012 (r4099)
@@ -41,7 +41,7 @@
#endif
#include <cstring>
-#if (_MSC_VER == 1600) /* VS2010 */
+#if (_MSC_VER >= 1600) /* VS2010 */
#include "../Uml/Uml_xsd.h"
#endif
@@ -60,8 +60,8 @@
//structure to identify an object
struct _upi_o_id {
unsigned long dnid;
- unsigned long oid;
- _upi_o_id(const unsigned long d, const unsigned long o)
+ UdmPseudoObject::ob_id_type oid;
+ _upi_o_id(const unsigned long d, const UdmPseudoObject::ob_id_type o)
{
dnid = d;
oid = o;
@@ -224,7 +224,7 @@
};
-UdmPseudoObject::UdmPseudoObject(unsigned long dn_id, unsigned long ob_id)
+UdmPseudoObject::UdmPseudoObject(unsigned long dn_id, ob_id_type ob_id)
{
this->dn_id = dn_id;
this->ob_id = ob_id;
@@ -260,7 +260,7 @@
return *this;
};
-unsigned long UdmPseudoObject::_ob_id() const
+UdmPseudoObject::ob_id_type UdmPseudoObject::_ob_id() const
{
return ob_id;
};
@@ -1518,6 +1518,7 @@
bool UdmPseudoDataNetwork::OCL_Evaluate(cint_string& res)
{
// TODO: print a warning that constraints are disabled
+ return true;
}
#endif /* NO_ANTLR */
More information about the Mobies-commit
mailing list