Skip to content

Commit 78aaa94

Browse files
duchangyuduchangyu
committed
Update for AutoCAD2015
1 parent d48d960 commit 78aaa94

File tree

16 files changed

+315
-24
lines changed

16 files changed

+315
-24
lines changed

‎ArxAppWiz/Scripts/1033/default.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ function OnFinish (selProj, selObj) {
4949
wizard.AddSymbol ("ARX_CLR_SUPPORT", 'false') ;
5050
}
5151

52-
CopyPropsFile ( 'Autodesk.arx-2014.props', strProjectName) ;
53-
CopyPropsFile ( 'Autodesk.arx-2014-net.props', strProjectName) ;
52+
CopyPropsFile ( 'Autodesk.arx-2015.props', strProjectName) ;
53+
CopyPropsFile ( 'Autodesk.arx-2015-net.props', strProjectName) ;
5454
CopyPropsFile ( 'crx.props', strProjectName) ;
5555

5656
//selProj =CreateProject (strProjectName, strProjectPath) ; //- Use the default Win32 only project template from Visual Studio

‎ArxAppWiz/Templates/1033/Autodesk.arx-2015-net.props‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!-- http://msdn.microsoft.com/en-us/library/ms171458.aspx -->
5+
<PropertyGroup>
6+
<_ProjectFileVersion>20.0.0.1</_ProjectFileVersion>
7+
<_PropertySheetDisplayName>ObjectARX .Net</_PropertySheetDisplayName>
8+
<TargetExt>.dll</TargetExt>
9+
</PropertyGroup>
10+
11+
<ImportGroup Label="PropertySheets">
12+
</ImportGroup>
13+
14+
<PropertyGroup Label="Globals">
15+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16+
<RootNamespace>$(TargetName)</RootNamespace>
17+
</PropertyGroup>
18+
19+
<PropertyGroup>
20+
<ReferencePath>$(ArxSdkIncs);$(ReferencePath)</ReferencePath>
21+
</PropertyGroup>
22+
23+
<ItemDefinitionGroup>
24+
<!-- Copy of Microsoft.Cpp.ManagedExtensions.props (C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0) -->
25+
<ClCompile>
26+
<ExceptionHandling>Async</ExceptionHandling>
27+
<CompileAsManaged>true</CompileAsManaged>
28+
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
29+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
30+
<MinimalRebuild></MinimalRebuild>
31+
<!-- To defeat the arx.props -->
32+
<SmallerTypeCheck>false</SmallerTypeCheck>
33+
</ClCompile>
34+
<Link>
35+
<FixedBaseAddress>false</FixedBaseAddress>
36+
<AssemblyDebug Condition="'$(UseDebugLibraries)'=='true'">true</AssemblyDebug>
37+
</Link>
38+
</ItemDefinitionGroup>
39+
40+
<ItemGroup>
41+
<Reference Include="System" />
42+
<Reference Include="System.Data" />
43+
<Reference Include="System.Xml" />
44+
<Reference Include="System.Core" />
45+
</ItemGroup>
46+
47+
</Project>

‎ArxAppWiz/Templates/1033/Autodesk.arx-2015.props‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!-- http://msdn.microsoft.com/en-us/library/ms171458.aspx -->
5+
<PropertyGroup>
6+
<_ProjectFileVersion>20.0.0.1</_ProjectFileVersion>
7+
<_PropertySheetDisplayName>ObjectARX 2015</_PropertySheetDisplayName>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<AcadDir Condition="'$(Platform)'=='x64'">C:\Program Files\Autodesk\AutoCAD 2015\</AcadDir>
12+
<AcadDir Condition="'$(Platform)'=='Win32'">C:\Program Files (x86)\Autodesk\AutoCAD 2015\</AcadDir>
13+
<AcadExe Condition="'$(ArxAppType)'=='dbx' or '$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='arx' or '$(ArxAppType)'=='arxnet'">acad.exe</AcadExe>
14+
<AcadExe Condition="'$(ArxAppType)'=='crx' or '$(ArxAppType)'=='crxnet'">accoreconsole.exe</AcadExe>
15+
<ArxSdkDir>C:\ObjectARX\</ArxSdkDir>
16+
17+
<ArxSdkIncs Condition="'$(Platform)'=='Win32'">$(ArxSdkDir)\inc;$(ArxSdkDir)\inc-win32</ArxSdkIncs>
18+
<ArxSdkIncs Condition="'$(Platform)'=='x64'">$(ArxSdkDir)\inc;$(ArxSdkDir)\inc-x64</ArxSdkIncs>
19+
<ArxHlrIncs>$(ArxSdkDir)\utils\HlrApi\inc</ArxHlrIncs>
20+
<ArxAmodelerIncs>$(ArxSdkDir)\utils\amodeler\inc</ArxAmodelerIncs>
21+
<ArxBrepIncs>$(ArxSdkDir)\utils\brep\inc</ArxBrepIncs>
22+
<ArxAtilIncs>$(ArxSdkDir)\utils\Atil\Inc</ArxAtilIncs>
23+
24+
<ArxSdkLibs Condition="'$(Platform)'=='Win32'">$(ArxSdkDir)\lib-win32</ArxSdkLibs>
25+
<ArxSdkLibs Condition="'$(Platform)'=='x64'">$(ArxSdkDir)\lib-x64</ArxSdkLibs>
26+
<ArxHlrLibs>$(ArxSdkDir)\utils\HlrApi\lib-$(Platform)</ArxHlrLibs>
27+
<ArxAmodelerLibs>$(ArxSdkDir)\utils\amodeler\lib-$(Platform)</ArxAmodelerLibs>
28+
<ArxBrepLibs>$(ArxSdkDir)\utils\brep\lib-$(Platform)</ArxBrepLibs>
29+
<ArxAtilLibs>$(ArxSdkDir)\utils\Atil\Lib-$(Platform)</ArxAtilLibs>
30+
<ArxSDKVersion>20.0</ArxSDKVersion>
31+
<ArxSDKPlatform>v110</ArxSDKPlatform>
32+
</PropertyGroup>
33+
34+
<ImportGroup Label="PropertySheets">
35+
<Import Condition="'$(ArxAppType)'=='dbx' or '$(ArxAppType)'=='dbxnet'" Project="$(ArxSdkDir)\inc\dbx.props" />
36+
<Import Condition="'$(ArxAppType)'=='crx' or '$(ArxAppType)'=='crxnet'" Project="$(ArxSdkDir)\inc\crx.props" />
37+
<Import Condition="'$(ArxAppType)'=='arx' or '$(ArxAppType)'=='arxnet'" Project="$(ArxSdkDir)\inc\arx.props" />
38+
<Import Condition="'$(Configuration)'=='Release'" Project="$(ArxSdkDir)\inc\rxsdk_Releasecfg.props" />
39+
<Import Condition="'$(Configuration)'=='Debug'" Project="$(ArxSdkDir)\inc\rxsdk_Debugcfg.props" />
40+
<Import Condition="'$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='crxnet' or '$(ArxAppType)'=='arxnet'" Project="Autodesk.arx-2015-net.props" />
41+
</ImportGroup>
42+
43+
<PropertyGroup>
44+
<!-- ExecutablePath>$(ExecutablePath)</ExecutablePath -->
45+
<IncludePath>$(ArxSdkIncs);$(ArxHlrIncs);$(ArxAmodelerIncs);$(ArxBrepIncs);$(ArxAtilIncs);$(IncludePath)</IncludePath>
46+
<ReferencePath>$(ArxSdkIncs);$(ReferencePath)</ReferencePath>
47+
<LibraryPath>$(ArxSdkLibs);$(ArxHlrLibs);$(ArxAmodelerLibs);$(ArxBrepLibs);$(ArxLibIncs);$(LibraryPath)</LibraryPath>
48+
<!-- SourcePath>$(SourcePath)</SourcePath -->
49+
<!-- ExcludePath>$(ExcludePath)</ExcludePath -->
50+
</PropertyGroup>
51+
52+
<PropertyGroup>
53+
<!-- Local Windows debugger -->
54+
<LocalDebuggerDebuggerType>Auto</LocalDebuggerDebuggerType>
55+
<!-- LocalDebuggerCommand is defined into an empty $(TargetPath) for the property page, it is later redefined to its proper value. -->
56+
<LocalDebuggerCommand>$(AcadDir)$(AcadExe)</LocalDebuggerCommand>
57+
<LocalDebuggerWorkingDirectory>$(ProjectDir)</LocalDebuggerWorkingDirectory>
58+
<!-- LocalDebuggerMergeEnvironment>true</LocalDebuggerMergeEnvironment -->
59+
<!-- LocalDebuggerAttach>False</LocalDebuggerAttach -->
60+
<!-- LocalDebuggerSQLDebugging>False</LocalDebuggerSQLDebugging -->
61+
</PropertyGroup>
62+
63+
<ItemDefinitionGroup>
64+
<Midl>
65+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
66+
<TypeLibraryName>$(IntDir)$(TargetName).tlb</TypeLibraryName>
67+
<HeaderFileName>%(Filename)_i.h</HeaderFileName>
68+
<InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
69+
</Midl>
70+
<ClCompile>
71+
<PreprocessorDefinitions Condition="'$(ArxAppType)'=='dbx' or '$(ArxAppType)'=='dbxnet'">_DBXAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72+
<PreprocessorDefinitions Condition="'$(ArxAppType)'=='crx' or '$(ArxAppType)'=='crxnet'">_CRXAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
73+
<PreprocessorDefinitions Condition="'$(ArxAppType)'=='arx' or '$(ArxAppType)'=='arxnet'">_ACRXAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
74+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
75+
<AdditionalUsingDirectories>$(ArxSdkDir)\inc-$(Platform);%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
76+
</ClCompile>
77+
<ResourceCompile>
78+
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
79+
<AdditionalIncludeDirectories>$(IntDir)</AdditionalIncludeDirectories>
80+
</ResourceCompile>
81+
<Link>
82+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
83+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
84+
<TargetMachine Condition="'$(Platform)'=='Win32'">MachineX86</TargetMachine>
85+
<TargetMachine Condition="'$(Platform)'=='x64'">MachineX64</TargetMachine>
86+
</Link>
87+
</ItemDefinitionGroup>
88+
89+
</Project>

‎ArxAppWiz/Templates/1033/StdAfx.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ extern AcApDataManager<CDocData> DocVars ;
168168
[!if !ATL_COM_SERVER]
169169
[!if DBX_COM_IMPORT]
170170
//-----------------------------------------------------------------------------
171-
#import "axdb19enu.tlb" raw_interfaces_only no_namespace
171+
#import "axdb20enu.tlb" raw_interfaces_only no_namespace
172172

173173
[!endif]
174174
[!if ACAD_COM_IMPORT]
175175
//-----------------------------------------------------------------------------
176-
#import "acax19enu.tlb" raw_interfaces_only no_namespace
176+
#import "acax20enu.tlb" raw_interfaces_only no_namespace
177177

178178
[!endif]
179179
[!endif]

‎ArxAppWiz/Templates/1033/root.idl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ library [!output RDS_SYMB][!output SAFE_PROJECT_NAME]Lib
3232
//----- axdb16enu.tlb is guaranteed to be available in all locales.
3333
//----- If you want to provide localized typelib then you must import
3434
//----- localized tlb here.
35-
importlib("axdb19enu.tlb");
35+
importlib("axdb20enu.tlb");
3636
[!endif]
3737
};

‎ArxAppWiz/Templates/1033/x64win32.vcxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,12 @@
5454

5555
<ImportGroup Label="PropertySheets">
5656
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57-
<Import Project="Autodesk.arx-2014.props" />
57+
<Import Project="Autodesk.arx-2015.props" />
5858
</ImportGroup>
5959
<PropertyGroup Label="Configuration">
6060
<PlatformToolset Condition="'$(ArxSDKPlatform)'=='v90'">v90</PlatformToolset>
6161
<PlatformToolset Condition="'$(ArxSDKPlatform)'=='v100'">v100</PlatformToolset>
62+
<PlatformToolset Condition="'$(ArxSDKPlatform)'=='v110'">v110</PlatformToolset>
6263
</PropertyGroup>
6364

6465
<PropertyGroup Label="UserMacros" />

‎ArxWizCommon/arxCommon.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//- Copyright (c) Autodesk, Inc. All rights reserved.
22
//- by Cyrille Fauvel - Autodesk Developer Technical Services
3-
var szWizardsVersion ="19, 0, 1, 0 - February 14th, 2013" ;
3+
var szWizardsVersion ="20, 0, 1, 0 - December 5th, 2013" ;
44

5-
var szArzWizApplicationTitle ="ObjectARX/DBX Application Wizard for AutoCAD 2014" ;
5+
var szArzWizApplicationTitle ="ObjectARX/DBX Application Wizard for AutoCAD 2015" ;
66
var szArxWizCOMWrapperTitle ="AutoCAD COM Wrapper Object" ;
77
var szArxWizDynPropTitle ="AutoCAD Object Dynamic Property" ;
88
var szArxWizObjectTitle ="ObjectDBX Custom Object Class Wizard" ;
@@ -16,7 +16,7 @@ var szArxMemVariableWizTitle ="Add Member Variable Wizard" ;
1616

1717
//- Get an AutoCAD release
1818
function FindAutoCAD() {
19-
var szPath = FindAutoCADUsingWMI("c:\\Program Files\\Autodesk\\AutoCAD 2014\\");
19+
var szPath = FindAutoCADUsingWMI("c:\\Program Files\\Autodesk\\AutoCAD 2015\\");
2020
return (szPath);
2121
}
2222

‎ArxWizPatchFilesCA/CustomAction.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static ActionResult PatchPropsWizFiles(Session session)
121121
session.Log(" >> PatchPropsWizFiles: ACAD = " + ACAD);
122122

123123
DirectoryInfo di = new DirectoryInfo(TARGETDIR);
124-
FileInfo[] files = di.GetFiles("*2014*.props", SearchOption.AllDirectories).ToArray();
124+
FileInfo[] files = di.GetFiles("*2015*.props", SearchOption.AllDirectories).ToArray();
125125
session.Log(" >> PatchPropsWizFiles: DirectoryInfo = " + files.Length.ToString());
126126
foreach (FileInfo file in files)
127127
{
@@ -130,8 +130,8 @@ public static ActionResult PatchPropsWizFiles(Session session)
130130
session.Log(" >> PatchPropsWizFiles: =>> " + file.FullName);
131131
string szData = System.IO.File.ReadAllText(file.FullName);
132132
szData = szData.Replace(@"<ArxSdkDir>C:\ObjectARX\</ArxSdkDir>", @"<ArxSdkDir>" + ARXPATH + "</ArxSdkDir>");
133-
szData = szData.Replace("<AcadDir Condition=\"'$(Platform)'=='x64'\">C:\\Program Files\\Autodesk\\AutoCAD 2014\\</AcadDir>", "<AcadDir Condition=\"'$(Platform)'=='x64'\">" + ACAD + "</AcadDir>") ;
134-
szData = szData.Replace("<AcadDir Condition=\"'$(Platform)'=='Win32'\">C:\\Program Files (x86)\\Autodesk\\AutoCAD 2014\\</AcadDir>", "<AcadDir Condition=\"'$(Platform)'=='Win32'\">" + ACAD + "</AcadDir>") ;
133+
szData = szData.Replace("<AcadDir Condition=\"'$(Platform)'=='x64'\">C:\\Program Files\\Autodesk\\AutoCAD 2015\\</AcadDir>", "<AcadDir Condition=\"'$(Platform)'=='x64'\">" + ACAD + "</AcadDir>") ;
134+
szData = szData.Replace("<AcadDir Condition=\"'$(Platform)'=='Win32'\">C:\\Program Files (x86)\\Autodesk\\AutoCAD 2015\\</AcadDir>", "<AcadDir Condition=\"'$(Platform)'=='Win32'\">" + ACAD + "</AcadDir>") ;
135135
System.IO.File.WriteAllText(file.FullName, szData);
136136
}
137137
catch

‎ObjectARXWizardsInstaller/Binary/ArxWizPatchFiles.CA.dll‎

15.3 KB
Binary file not shown.

‎ObjectARXWizardsInstaller/ObjectARXWizards.wxs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33

44
<?define RTMProductVersion = "18.0.0"?> <!-- The first one - do not edit -->
5-
<?define ProductVersion = "19.1.0"?>
5+
<?define ProductVersion = "20.0.0"?>
66
<?define UpgradeCode = "{737C88C2-4A99-44F0-AD3D-32EEE71DF54D}"?>
77

88
<Product
99
Id="*"
1010
Codepage="1252"
1111
Language="1033"
1212
Manufacturer="Autodesk"
13-
Name="ObjectARX 2014 Wizards"
13+
Name="ObjectARX 2015 Wizards"
1414
UpgradeCode="$(var.UpgradeCode)"
1515
Version="$(var.ProductVersion)"
1616
>
@@ -33,10 +33,10 @@
3333
<?include property.wxi ?>
3434
<?include UI.wxi ?>
3535

36-
<Condition Message="Microsoft Visual Studio Pro/Premium/Ultimate 2010/2012 or Visual C++ Express Edition 2010/2012 must be present on the target machine.">
37-
<![CDATA[VS2010_PRO_VC OR VC2010_EXPRESS_VC OR VS2012_PRO_VC OR VS2012_EXPRESS_VC]]>
36+
<Condition Message="Microsoft Visual Studio Pro/Premium/Ultimate 2012/2013 or Visual C++ Express Edition 2012/2013 must be present on the target machine.">
37+
<![CDATA[VS2013_PRO_VC OR VC2013_EXPRESS_VC OR VS2012_PRO_VC OR VS2012_EXPRESS_VC]]>
3838
</Condition>
39-
<Condition Message="This application requires .NET Framework 4.0. Please install the .NET Framework then run this installer again.">
39+
<Condition Message="This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again.">
4040
<![CDATA[MsiNetAssemblySupport >= "4.0"]]>
4141
</Condition>
4242
<!-- Condition Message="You need to be an administrator to install this product.">
@@ -46,7 +46,7 @@
4646
<!-- http://blogs.msdn.com/b/jschaffe/archive/2012/10/23/creating-wix-custom-actions-in-c-and-passing-parameters.aspx -->
4747
<Binary Id="ArxWizPatchFiles.dll" SourceFile="Binary\ArxWizPatchFiles.CA.dll" />
4848
<CustomAction Id="CA_PatchVSFiles" BinaryKey="ArxWizPatchFiles.dll" DllEntry="PatchVSFiles" Execute="immediate" Return="check" />
49-
<Property Id="VSList" Value="VS2010_PRO_VC;VC2010_EXPRESS_VC;VS2012_PRO_VC;VS2012_EXPRESS_VC" />
49+
<Property Id="VSList" Value="VS2013_PRO_VC;VC2013_EXPRESS_VC;VS2012_PRO_VC;VS2012_EXPRESS_VC" />
5050
<Property Id="ArxWizList" Value="ArxAppWiz;ArxAppWiz182;ArxAtlWizComWrapper;ArxAtlWizDynProp;ArxWizCustomObject;ArxWizJig;ArxWizMFCSupport;ArxWizNETWrapper;ArxWizReactors" />
5151
<CustomAction Id="CA_PatchHTMLWizFiles" BinaryKey="ArxWizPatchFiles.dll" DllEntry="PatchHTMLWizFiles" Execute="immediate" Return="check" />
5252
<CustomAction Id="CA_PatchPropsWizFiles" BinaryKey="ArxWizPatchFiles.dll" DllEntry="PatchPropsWizFiles" Execute="immediate" Return="check" />

0 commit comments

Comments
 (0)