Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed xsc specific code, can be done through the verbatim mpc support #1295

Merged
merged 6 commits into from
Nov 17, 2020
Merged

Removed xsc specific code, can be done through the verbatim mpc support #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
acb224c
Removed xsc specific code, can be done through the verbatim mpc support
jwillemsen Nov 11, 2020
17ed170
Removed xsc flags from docu
jwillemsen Nov 11, 2020
db932e2
Removed cidlc flags from docu
jwillemsen Nov 11, 2020
5e109b5
Removed dds flag docu, not used anymore
jwillemsen Nov 11, 2020
e1516a1
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into jwi…
jwillemsen Nov 17, 2020
194911f
Merge branch 'master' into jwi-xsccleanup2
jwillemsen Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ACE/bin/MakeProjectCreator/docs/templates/gnu.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
// Current as of 2/27/2007
// This defines the role of all the template variables specific to the
// 'gnuace' project type.
//
// Please try to keep this alphabetically sorted.
//
build_dir_per_project = Specifies to use per project object file output dirs (VDIR and VSHDIR) if set to '1'.
ciao = Indicates whether or not this project contains CIAO code.
cidlc = The full path to the cidl compiler.
cidlc_dep = The full path to the cidl compiler as a dependency.
cidlc_flags = The default flags for the cidl compiler.
dds = Indicates whether or not this project contains DDS code.
idl_files = When a Define_Custom(IDL) is used, they will be accessible through this variable name.
install = This is a synonym for exeout.
linkflags = Platform specific flags passed during the linking of dynamic libraries and executables.
Expand All @@ -22,6 +17,3 @@ tao_idlflags = The default flags for the idl compiler.
targetoutdir = Specifies a location for all targets and intermediaries within the makefile. It should always end in a slash.
vpath = The value will be used as the VPATH setting within the makefile.
xerceslib = The name of the Xerces library.
xsc_bin = The full path of the XSC executable.
xsc_dep = The full path of the XSC executable as a dependency.
xsc_flags = The default flags to the XSC executable.
9 changes: 0 additions & 9 deletions ACE/bin/MakeProjectCreator/templates/gnu.mpd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,6 @@ TAO_IDL_DEP = <%tao_idl_dep%>$(EXEEXT)
<%if(tao_idlflags)%>
TAO_IDLFLAGS = <%tao_idlflags%><%if(!compares(vms_old_make, 1))%>$(if $(ARCH), -g $(call ADD_QUOTE,$(call ADD_ARCH,$(ACE_ROOT)/bin/ace_gperf)))<%endif%>
<%endif%>
<%if(xsc_bin)%>
XSC_BIN = <%xsc_bin%>
<%endif%>
<%if(xsc_dep)%>
XSC_DEP = <%xsc_dep%>$(EXEEXT)
<%endif%>
<%if(xsc_flags)%>
XSC_FLAGS = <%xsc_flags%>
<%endif%>
<%if(tao_idl3_to_idl2)%>
TAO_IDL3_TO_IDL2 = <%tao_idl3_to_idl2%>
<%endif%>
Expand Down