Skip to content

Commit 228c49a

Browse files
MadhukarMoogalaMadhukarMoogala
committed
For AutoCAD 2026 wizards
1 parent ee07c61 commit 228c49a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+718
-268
lines changed

‎ArxAppWiz/Scripts/1033/default.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ function OnFinish(selProj, selObj) {
4545
wizard.AddSymbol("ARX_CLR_SUPPORT", "false");
4646
}
4747
//TOCHANGE Must change for every release.
48-
CopyPropsFile("Autodesk.arx-2025.props", strProjectName);
49-
CopyPropsFile("Autodesk.arx-2025-net.props", strProjectName);
48+
CopyPropsFile("Autodesk.arx-2026.props", strProjectName);
49+
CopyPropsFile("Autodesk.arx-2026-net.props", strProjectName);
5050
//TOCHANGE
5151
CopyPropsFile("crx.props", strProjectName);
5252

ArxAppWiz/Templates/1033/Autodesk.arx-2025-net.props renamed to ArxAppWiz/Templates/1033/Autodesk.arx-2026-net.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<!-- http://msdn.microsoft.com/en-us/library/ms171458.aspx -->
66
<PropertyGroup>
7-
<_ProjectFileVersion>25.0</_ProjectFileVersion>
7+
<_ProjectFileVersion>26.0</_ProjectFileVersion>
88
<_PropertySheetDisplayName>ObjectARX .Net</_PropertySheetDisplayName>
99
<TargetExt>.dll</TargetExt>
1010
</PropertyGroup>
@@ -25,10 +25,10 @@
2525
<ItemDefinitionGroup>
2626
<!-- Copy of Microsoft.Cpp.ManagedExtensions.props (C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0) -->
2727
<ClCompile>
28-
<ExceptionHandling>Async</ExceptionHandling>
28+
<ExceptionHandling>Async</ExceptionHandling>
2929
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
3030
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
31-
<MinimalRebuild>false</MinimalRebuild>
31+
<MinimalRebuild>false</MinimalRebuild>
3232
<SmallerTypeCheck>false</SmallerTypeCheck>
3333
</ClCompile>
3434
<Link>

_Installs/Autodesk.arx-2025.props renamed to ArxAppWiz/Templates/1033/Autodesk.arx-2026.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<!-- http://msdn.microsoft.com/en-us/library/ms171458.aspx -->
66
<PropertyGroup>
7-
<_ProjectFileVersion>25.0</_ProjectFileVersion>
8-
<_PropertySheetDisplayName>ObjectARX 2025</_PropertySheetDisplayName>
7+
<_ProjectFileVersion>26.0</_ProjectFileVersion>
8+
<_PropertySheetDisplayName>ObjectARX 2026</_PropertySheetDisplayName>
99
</PropertyGroup>
1010

1111
<!--There is No 32 Bit AutoCAD Starting From AutoCAD 2020-->
1212
<PropertyGroup>
13-
<AcadDir Condition="'$(Platform)'=='x64'">C:\Program Files\Autodesk\AutoCAD 2025\</AcadDir>
13+
<AcadDir Condition="'$(Platform)'=='x64'">C:\Program Files\Autodesk\AutoCAD 2026\</AcadDir>
1414
<AcadExe Condition="'$(ArxAppType)'=='dbx' or '$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='arx' or '$(ArxAppType)'=='arxnet'">acad.exe</AcadExe>
1515
<AcadExe Condition="'$(ArxAppType)'=='crx' or '$(ArxAppType)'=='crxnet'">accoreconsole.exe</AcadExe>
1616
<ArxSdkDir>C:\ObjectARX\</ArxSdkDir>
@@ -24,7 +24,7 @@
2424
<ArxAmodelerLibs>$(ArxSdkDir)\utils\amodeler\lib-$(Platform)</ArxAmodelerLibs>
2525
<ArxBrepLibs>$(ArxSdkDir)\utils\brep\lib-$(Platform)</ArxBrepLibs>
2626
<ArxAtilLibs>$(ArxSdkDir)\utils\Atil\Lib-$(Platform)</ArxAtilLibs>
27-
<ArxSDKVersion>25.0</ArxSDKVersion>
27+
<ArxSDKVersion>26.0</ArxSDKVersion>
2828
<ArxSDKPlatform>v143</ArxSDKPlatform>
2929
</PropertyGroup>
3030

@@ -34,7 +34,7 @@
3434
<Import Condition="'$(ArxAppType)'=='arx' or '$(ArxAppType)'=='arxnet'" Project="$(ArxSdkDir)\inc\arx.props" />
3535
<Import Condition="'$(Configuration)'=='Release'" Project="$(ArxSdkDir)\inc\rxsdk_Releasecfg.props" />
3636
<Import Condition="'$(Configuration)'=='Debug'" Project="$(ArxSdkDir)\inc\rxsdk_Debugcfg.props" />
37-
<Import Condition="'$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='crxnet' or '$(ArxAppType)'=='arxnet'" Project="Autodesk.arx-2025-net.props" />
37+
<Import Condition="'$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='crxnet' or '$(ArxAppType)'=='arxnet'" Project="Autodesk.arx-2026-net.props" />
3838
</ImportGroup>
3939

4040
<PropertyGroup>

‎ArxAppWiz/Templates/1033/ReadMe.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ArxAppWizard has created this [!output PROJECT_NAME] application for you.
66
This project uses the ObjectARX SDK .props file from the ObjectARX SDK to set the C++ compiler, MIDL,
77
and Linker options appropriately. The project .props file is located in your project directory and reference
88
the ObjectARX SDK and AutoCAD executable paths.
9-
To create a new configuration and/or change the paths references copy or modify the Autodesk.arx-2025.props
9+
To create a new configuration and/or change the paths references copy or modify the Autodesk.arx-2026.props
1010
File, like this:
1111
#7 <AcadDir Condition="'$(Platform)'=='x64'">[acad.exe path on your x64 windows platform]</AcadDir>
1212
#8 <ArxSdkDir>[the location you installed the ObjectARX SDK]</ArxSdkDir>

‎ArxAppWiz/Templates/1033/Resource.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
//
55
#define IDS_PROJNAME 100
66
[!if ATL_COM_SERVER]
7-
#define IDR_[!output UPPER_CASE_SAFE_PROJECT_NAME] 101
8-
[!endif]
7+
#define IDR_ [!output UPPER_CASE_SAFE_PROJECT_NAME] 101
8+
[!endif]
99

1010
// Next default values for new objects
11-
//
11+
//
1212
#ifdef APSTUDIO_INVOKED
1313
#ifndef APSTUDIO_READONLY_SYMBOLS
14-
#define _APS_NEXT_RESOURCE_VALUE 102
15-
#define _APS_NEXT_COMMAND_VALUE 32768
16-
#define _APS_NEXT_CONTROL_VALUE 100
17-
#define _APS_NEXT_SYMED_VALUE 102
14+
#define _APS_NEXT_RESOURCE_VALUE 102
15+
#define _APS_NEXT_COMMAND_VALUE 32768
16+
#define _APS_NEXT_CONTROL_VALUE 100
17+
#define _APS_NEXT_SYMED_VALUE 102
1818
#endif
1919
#endif

‎ArxAppWiz/Templates/1033/StdAfx.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
//- but are changed infrequently
2626
//-----------------------------------------------------------------------------
2727
#pragma once
28-
#define [!output UPPER_CASE_PROJECT_NAME]_MODULE
28+
#define[!output UPPER_CASE_PROJECT_NAME] _MODULE
2929

3030
/*
3131
#ifndef _ALLOW_RTCc_IN_STL
@@ -46,7 +46,7 @@
4646
[!endif]
4747
#pragma pack(push, 8)
4848
#pragma warning(disable : 4786 4996)
49-
//#pragma warning(disable: 4098)
49+
// #pragma warning(disable: 4098)
5050

5151
[!if STD_COM_SERVER || ATL_COM_SERVER || MFC_EXT_SHARED]
5252
//-----------------------------------------------------------------------------
@@ -143,16 +143,16 @@
143143
//-----------------------------------------------------------------------------
144144
//- Include ObjectDBX/ObjectARX headers
145145
//- Uncomment one of the following lines to bring a given library in your project.
146-
//#define _BREP_SUPPORT_ //- Support for the BRep API
147-
//#define _HLR_SUPPORT_ //- Support for the Hidden Line Removal API
148-
//#define _AMODELER_SUPPORT_ //- Support for the AModeler API
146+
// #define _BREP_SUPPORT_ //- Support for the BRep API
147+
// #define _HLR_SUPPORT_ //- Support for the Hidden Line Removal API
148+
// #define _AMODELER_SUPPORT_ //- Support for the AModeler API
149149
[!if APP_ARX_TYPE || APP_CRX_TYPE]
150-
//#define _ASE_SUPPORT_ //- Support for the ASI/ASE API
151-
//#define _RENDER_SUPPORT_ //- Support for the AutoCAD Render API
150+
// #define _ASE_SUPPORT_ //- Support for the ASI/ASE API
151+
// #define _RENDER_SUPPORT_ //- Support for the AutoCAD Render API
152152
[!if !APP_CRX_TYPE]
153-
//#define _ARX_CUSTOM_DRAG_N_DROP_ //- Support for the ObjectARX Drag'n Drop API
153+
// #define _ARX_CUSTOM_DRAG_N_DROP_ //- Support for the ObjectARX Drag'n Drop API
154154
[!endif]
155-
//#define _INC_LEAGACY_HEADERS_ //- Include legacy headers in this project
155+
// #define _INC_LEAGACY_HEADERS_ //- Include legacy headers in this project
156156
#include "arxHeaders.h"
157157

158158
[!else]
@@ -168,18 +168,19 @@
168168
#include "DocData.h" //- Your document specific data class holder
169169

170170
//- Declare it as an extern here so that it becomes available in all modules
171-
extern AcApDataManager<CDocData> DocVars;
171+
extern AcApDataManager<CDocData>
172+
DocVars;
172173

173174
[!endif]
174175
[!if !ATL_COM_SERVER]
175176
[!if DBX_COM_IMPORT]
176177
//-----------------------------------------------------------------------------
177-
#import "axdb24enu.tlb" raw_interfaces_only no_namespace
178+
#import "axdb25enu.tlb" raw_interfaces_only no_namespace
178179

179180
[!endif]
180181
[!if ACAD_COM_IMPORT]
181182
//-----------------------------------------------------------------------------
182-
#import "acax24enu.tlb" raw_interfaces_only no_namespace
183+
#import "acax25enu.tlb" raw_interfaces_only no_namespace
183184

184185
[!endif]
185186
[!endif]

‎ArxAppWiz/Templates/1033/x64win32.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</ImportGroup>
4646
<ImportGroup Label="PropertySheets">
4747
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48-
<Import Project="Autodesk.arx-2025.props" />
48+
<Import Project="Autodesk.arx-2026.props" />
4949
</ImportGroup>
5050
<PropertyGroup Label="Configuration">
5151
<PlatformToolset Condition="'$(ArxSDKPlatform)'=='v143'">v143</PlatformToolset>

‎ArxAppWiz182/Scripts/1033/default.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,6 @@ function MakeOmfResourceProject(selProj, strProjectPath, strProjectName) {
259259
//-----------------------------------------------------------------------------
260260
//- See arxCommon.js for details
261261
function FindAutoCAD() {
262-
var szPath = "C:\\Program Files\\Autodesk\\AutoCAD 2025\\";
262+
var szPath = "C:\\Program Files\\Autodesk\\AutoCAD 2026\\";
263263
return (szPath);
264264
}

‎ArxAppWiz182/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("axdb18enu.tlb");
35+
importlib("axdb25enu.tlb");
3636
[!endif]
3737
};

‎ArxWizCustomAction/CustomAction.cs‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
using System.Linq;
44
using Microsoft.Deployment.WindowsInstaller;
55
using System.IO;
6-
using System.Xml;
7-
using System.Text.RegularExpressions;
8-
using System.Xml.Linq;
9-
using System.Diagnostics;
10-
using System.Windows.Forms;
6+
117

128
//Written by Madhukar Moogala ADN
139

@@ -28,15 +24,17 @@ public static class CustomActions
2824
[CustomAction]
2925
public static ActionResult PatchVSFiles(Session session)
3026
{
31-
27+
#if DEBUG
28+
System.Diagnostics.Debugger.Launch();
29+
#endif
3230
session.Log("Begin PatchVSFiles");
3331
string TARGETDIR = session["TARGETDIR"];
3432
//This gives us the right folder where the wizard files are sitting.
3533
string vcFolder = session["D_VS2022VCFOLDER"];
3634

3735
char[] delimiterChars = { ' ', ',', ';', ':', '\t' };
3836

39-
//ArxAppWiz;ArxAppWiz18_2;ArxAtlWizComWrapper;ArxAtlWizDynProp;ArxWizCustomObject;ArxWizJig;ArxWizMFCSupport;ArxWizNETWrapper;ArxWizReactors
37+
//ArxAppWiz;ArxAppWiz182;ArxAtlWizComWrapper;ArxAtlWizDynProp;ArxWizCustomObject;ArxWizJig;ArxWizMFCSupport;ArxWizNETWrapper;ArxWizReactors
4038
string pArxWizList = session["ArxWizList"];
4139
session.Log(" >> PatchVSFiles: ArxWizList = " + pArxWizList);
4240

@@ -68,16 +66,18 @@ public static ActionResult PatchVSFiles(Session session)
6866
return (ActionResult.Success);
6967
}
7068

71-
69+
7270
[CustomAction]
7371
public static ActionResult PatchHTMLWizFiles(Session session)
7472
{
75-
73+
#if DEBUG
74+
System.Diagnostics.Debugger.Launch();
75+
#endif
7676
session.Log("Begin PatchHTMLWizFiles");
7777
string TARGETDIR = session["TARGETDIR"];
7878
string RDS = String.IsNullOrEmpty(session["RDS"]) ? "ADSK" : session["RDS"];
7979
session.Log(" >> PatchHTMLWizFiles: RDS = " + RDS + " / TARGETDIR = " + TARGETDIR);
80-
//C:\Program Files (x86)\Autodesk\ObjectARX 2025 Wizards\
80+
//C:\Program Files (x86)\Autodesk\ObjectARX 2026 Wizards\
8181

8282
DirectoryInfo di = new DirectoryInfo(TARGETDIR);
8383
FileInfo[] files = di.GetFiles("default.htm", SearchOption.AllDirectories)
@@ -112,22 +112,20 @@ public static ActionResult PatchHTMLWizFiles(Session session)
112112
public static ActionResult PatchPropsWizFiles(Session session)
113113
{
114114
#if DEBUG
115-
int processId = Process.GetCurrentProcess().Id;
116-
string message = string.Format("Please attach the debugger to process [{0}].", processId);
117-
MessageBox.Show(message, "Debug");
115+
System.Diagnostics.Debugger.Launch();
118116
#endif
119117
session.Log("Begin PatchPropsWizFiles");
120118
//Debugger.Break () ;
121119

122120
string TARGETDIR = session["TARGETDIR"];
123121
string ARXPATH = session["ARXPATH"];
124122
session.Log(" >> PatchPropsWizFiles: ARXPATH = " + ARXPATH + " / TARGETDIR = " + TARGETDIR);
125-
//C:\Program Files (x86)\Autodesk\ObjectARX 2025 Wizards\
123+
//C:\Program Files (x86)\Autodesk\ObjectARX 2026 Wizards\
126124
string ACAD = session["ACAD"];
127125
session.Log(" >> PatchPropsWizFiles: ACAD = " + ACAD);
128126

129127
DirectoryInfo di = new DirectoryInfo(TARGETDIR);
130-
FileInfo[] files = di.GetFiles("*2025.props", SearchOption.AllDirectories).ToArray();
128+
FileInfo[] files = di.GetFiles("*2026.props", SearchOption.AllDirectories).ToArray();
131129
session.Log(" >> PatchPropsWizFiles: DirectoryInfo = " + files.Length.ToString());
132130
var _arxpath = ARXPATH;
133131
var _acad = ACAD;
@@ -138,12 +136,12 @@ public static ActionResult PatchPropsWizFiles(Session session)
138136
session.Log(" >> PatchPropsWizFiles: =>> " + file.FullName);
139137
string content = File.ReadAllText(file.FullName);
140138
content = content.Replace(@"C:\ObjectARX\", _arxpath);
141-
var from = @"C:\Program Files\Autodesk\AutoCAD 2025\";
139+
var from = @"C:\Program Files\Autodesk\AutoCAD 2026\";
142140
var to = _acad;
143141
session.Log($" >> PatchPropsWizFiles: =>> replacing {from} with {to}");
144142
content = content.Replace(from, to);
145143
File.WriteAllText(file.FullName, content);
146-
session.Log(" >> PatchPropsWizFiles: =>> saving");
144+
session.Log(" >> PatchPropsWizFiles: =>> saving");
147145

148146
}
149147
catch (Exception ex)

0 commit comments

Comments
 (0)