Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Updated copy of Tcl nmake support files and make use of default stubs and header installs |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | vc-reform |
Files: | files | file ages | folders |
SHA3-256: |
501f6351811531bf9a1216fc0f0219ab |
User & Date: | apnadkarni 2017-12-11 16:29:36 |
Context
2017-12-13
| ||
10:46 | Use nmakehlp -L to locate TDBC directories Closed-Leaf check-in: bf96767d46 user: apnadkarni tags: vc-reform | |
2017-12-11
| ||
16:29 | Updated copy of Tcl nmake support files and make use of default stubs and header installs check-in: 501f635181 user: apnadkarni tags: vc-reform | |
09:09 | Do not need Tcl sources. Also fix rc file macro name. check-in: 3ee1af86cf user: apnadkarni tags: vc-reform | |
Changes
Changes to win/makefile.vc.
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
..
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
$(TMP_DIR)\tdbc.obj \ $(TMP_DIR)\tdbcStubInit.obj \ $(TMP_DIR)\tdbcTokenize.obj PRJ_STUBOBJS = \ $(TMP_DIR)\tdbcStubLib.obj PRJHEADERS = \ $(GENERICDIR)\tdbc.h \ $(GENERICDIR)\tdbcDecls.h \ $(GENERICDIR)\tdbcInt.h INCLUDE_INSTALL_DIR = $(_INSTALLDIR)\..\include # Define the standard targets including install, test, shell !include "$(_RULESDIR)\targets.vc" $(PRJ_OBJS): $(PRJHEADERS) # The TIP 477 generation of pkgIndex.tcl from pkgIndex.tcl.in does not include # all replacements below so define our own it. pkgindex: $(OUT_DIR)\pkgIndex.tcl $(OUT_DIR)\pkgIndex.tcl: $(ROOT)\pkgIndex.tcl.in @nmakehlp -s << $** > [email protected] @[email protected] $(PROJECT) @[email protected] $(DOTVERSION) ................................................................................ @[email protected] -I$(INCLUDE_INSTALL_DIR) @[email protected] -I$(GENERICDIR) @[email protected] $(LIB_INSTALL_DIR) << # TDBC has additional installation in addition to that provided by # the default installation targets. install: default-install-stubs default-install-docs-n default-install-libraries: install-tdbc-extras install-tdbc-extras: $(OUT_DIR)\tdbcConfig.sh @$(CPY) $(OUT_DIR)\tdbcConfig.sh "$(LIB_INSTALL_DIR)" @echo Installing header files in '$(INCLUDE_INSTALL_DIR)' @$(CPY) "$(GENERICDIR)\tdbc.h" "$(INCLUDE_INSTALL_DIR)\" @$(CPY) "$(GENERICDIR)\tdbcDecls.h" "$(INCLUDE_INSTALL_DIR)\" |
|
|
<
>
|
>
<
<
|
<
<
<
<
|
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
..
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
$(TMP_DIR)\tdbc.obj \ $(TMP_DIR)\tdbcStubInit.obj \ $(TMP_DIR)\tdbcTokenize.obj PRJ_STUBOBJS = \ $(TMP_DIR)\tdbcStubLib.obj PRJ_HEADERS_PUBLIC = \ $(GENERICDIR)\tdbc.h \ $(GENERICDIR)\tdbcDecls.h PRJ_HEADERS = \ $(PRJ_HEADERS_PUBLIC) \ $(GENERICDIR)\tdbcInt.h # Define the standard targets including install, test, shell !include "$(_RULESDIR)\targets.vc" # The TIP 477 generation of pkgIndex.tcl from pkgIndex.tcl.in does not include # all replacements below so define our own it. pkgindex: $(OUT_DIR)\pkgIndex.tcl $(OUT_DIR)\pkgIndex.tcl: $(ROOT)\pkgIndex.tcl.in @nmakehlp -s << $** > [email protected] @[email protected] $(PROJECT) @[email protected] $(DOTVERSION) ................................................................................ @[email protected] -I$(INCLUDE_INSTALL_DIR) @[email protected] -I$(GENERICDIR) @[email protected] $(LIB_INSTALL_DIR) << # TDBC has additional installation in addition to that provided by # the default installation targets. install: default-install-docs-n default-install-libraries: install-tdbc-extras install-tdbc-extras: $(OUT_DIR)\tdbcConfig.sh @$(CPY) $(OUT_DIR)\tdbcConfig.sh "$(LIB_INSTALL_DIR)" |
Changes to win/rules.vc.
1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 |
#----------------------------------------------------------
# Display stats being used.
#----------------------------------------------------------
!message *** Intermediate directory will be '$(TMP_DIR)'
!message *** Output directory will be '$(OUT_DIR)'
!message *** Suffix for binaries will be '$(SUFX)'
!message *** Optional defines are '$(OPTDEFINES)'
!message *** Compiler version $(VCVER). Target machine is $(MACHINE)
!message *** Host architecture is $(NATIVE_ARCH)
!endif # ifdef _RULES_VC
|
> < |
1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 |
#----------------------------------------------------------
# Display stats being used.
#----------------------------------------------------------
!message *** Intermediate directory will be '$(TMP_DIR)'
!message *** Output directory will be '$(OUT_DIR)'
!message *** Installation, if selected, will be in '$(_INSTALLDIR)'
!message *** Suffix for binaries will be '$(SUFX)'
!message *** Compiler version $(VCVER). Target machine is $(MACHINE)
!message *** Host architecture is $(NATIVE_ARCH)
!endif # ifdef _RULES_VC
|
Changes to win/targets.vc.
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
!else $(DLLCMD) $** $(_VC_MANIFEST_EMBED_DLL) !endif [email protected] $*.exp !endif !ifndef DISABLE_STANDARD_TARGETS DISABLE_STANDARD_TARGETS = 0 !endif !if !$(DISABLE_STANDARD_TARGETS) setup: default-setup install: default-install clean: default-clean realclean: hose hose: default-hose distclean: realclean default-distclean test: default-test shell: default-shell !endif |
> > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > |
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 |
!else $(DLLCMD) $** $(_VC_MANIFEST_EMBED_DLL) !endif [email protected] $*.exp !endif !if "$(PRJ_HEADERS)" != "" && "$(PRJ_OBJS)" != "" $(PRJ_OBJS): $(PRJ_HEADERS) !endif # If parent makefile has defined stub objects, add their installation # to the default install !if "$(PRJ_STUBOBJS)" != "" default-install: default-install-stubs !endif # Unlike the other default targets, these cannot be in rules.vc because # the executed command depends on existence of macro PRJ_HEADERS_PUBLIC # that the parent makefile will not define until after including rules-ext.vc !if "$(PRJ_HEADERS_PUBLIC)" != "" default-install: default-install-headers default-install-headers: @echo Installing headers to '$(INCLUDE_INSTALL_DIR)' @for %f in ($(PRJ_HEADERS_PUBLIC)) do @$(COPY) %f "$(INCLUDE_INSTALL_DIR)" !endif !if "$(DISABLE_STANDARD_TARGETS)" == "" DISABLE_STANDARD_TARGETS = 0 !endif !if "$(DISABLE_TARGET_setup)" == "" DISABLE_TARGET_setup = 0 !endif !if "$(DISABLE_TARGET_install)" == "" DISABLE_TARGET_install = 0 !endif !if "$(DISABLE_TARGET_clean)" == "" DISABLE_TARGET_clean = 0 !endif !if "$(DISABLE_TARGET_test)" == "" DISABLE_TARGET_test = 0 !endif !if "$(DISABLE_TARGET_shell)" == "" DISABLE_TARGET_shell = 0 !endif !if !$(DISABLE_STANDARD_TARGETS) !if !$(DISABLE_TARGET_setup) setup: default-setup !endif !if !$(DISABLE_TARGET_install) install: default-install !endif !if !$(DISABLE_TARGET_clean) clean: default-clean realclean: hose hose: default-hose distclean: realclean default-distclean !endif !if !$(DISABLE_TARGET_test) test: default-test !endif !if !$(DISABLE_TARGET_shell) shell: default-shell !endif !endif # DISABLE_STANDARD_TARGETS |