Do not remove *.def in the cleanup rules because auto.def is a required part of autosetup. Remove the .o vs .obj detection/distinction because the Unix-like Windows environments use .o.
FossilOrigin-Name: 65eb1072e297f01ba4ce21fe644f709e75ebaec5307764b549efceafb88f6ebf
This commit is contained in:
stephan
parent
cda0d6fd74
commit
76bfcd13be
@ -7,7 +7,7 @@
|
||||
# the makefile manually. Just set the parameters below to values that
|
||||
# work well for your system.
|
||||
#
|
||||
|
||||
all:
|
||||
#XX# Lines starting with #XX# are TODOs for the port to autosetup
|
||||
|
||||
# The toplevel directory of the source tree. This is the directory
|
||||
@ -117,8 +117,6 @@ RELEASE = @RELEASE@
|
||||
#
|
||||
BEXE = @BUILD_EXEEXT@
|
||||
TEXE = @TARGET_EXEEXT@
|
||||
BOBJ = @BUILD_OBJEXT@
|
||||
TOBJ = @TARGET_OBJEXT@
|
||||
|
||||
#XX## The following variable is "1" if the configure script was able to locate
|
||||
#XX## the tclConfig.sh file. It is an empty string otherwise. When this
|
||||
@ -1667,13 +1665,14 @@ tidy:
|
||||
rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
|
||||
rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
|
||||
rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
|
||||
rm -f *.dll *.lib *.exp *.def *.pc *.vsix *.so *.dylib pkgIndex.tcl
|
||||
rm -f *.dll *.lib *.exp *.pc *.vsix *.so *.dylib pkgIndex.tcl
|
||||
rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE)
|
||||
rm -f mptester$(TEXE) rbu$(TEXE) srcck1$(TEXE)
|
||||
rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
|
||||
rm -f threadtest5$(TEXE)
|
||||
rm -f src-verify has_tclsh*
|
||||
|
||||
# FIXME? (rm *.def) will remove auto.def (part of autosetup)
|
||||
#
|
||||
# Removes build products and test logs. Retains ./configure outputs.
|
||||
#
|
||||
clean: tidy
|
||||
|
||||
@ -408,29 +408,23 @@ proc hwaci-looks-like-windows {{key host}} {
|
||||
# host and target are Windows-esque (Cygwin, MinGW, MSys). If the
|
||||
# build host is then BUILD_EXEEXT is [define]'d to ".exe", else "". If
|
||||
# the build target is then TARGET_EXEEXT is [define]'d to ".exe", else
|
||||
# "". It also sets BUILD_OBJEXT and TARGET_OBJEXT to the conventional
|
||||
# file extension for object files: .obj or .o.
|
||||
# "".
|
||||
proc hwaci-check-exeext {} {
|
||||
msg-checking "Build host is Windows-esque? "
|
||||
if {[hwaci-looks-like-windows host]} {
|
||||
define BUILD_EXEEXT ".exe"
|
||||
define BUILD_OBJEXT ".obj"
|
||||
msg-result yes
|
||||
} else {
|
||||
define BUILD_EXEEXT ""
|
||||
define BUILD_OBJEXT ".o"
|
||||
msg-result no
|
||||
}
|
||||
|
||||
msg-checking "Build target is Windows-esque? "
|
||||
if {[hwaci-looks-like-windows target]} {
|
||||
define TARGET_EXEEXT ".exe"
|
||||
define TARGET_OBJEXT ".obj"
|
||||
msg-result yes
|
||||
} else {
|
||||
define TARGET_EXEEXT ""
|
||||
define TARGET_OBJEXT ".o"
|
||||
|
||||
msg-result no
|
||||
}
|
||||
}
|
||||
|
||||
14
manifest
14
manifest
@ -1,9 +1,9 @@
|
||||
C Cleanups\sof\sthe\s--with-wasi-sdk\sbits.\sStraighten\sout\sVERSION\svs\sRELEASE.
|
||||
D 2024-09-26T12:16:46.672
|
||||
C Do\snot\sremove\s*.def\sin\sthe\scleanup\srules\sbecause\sauto.def\sis\sa\srequired\spart\sof\sautosetup.\sRemove\sthe\s.o\svs\s.obj\sdetection/distinction\sbecause\sthe\sUnix-like\sWindows\senvironments\suse\s.o.
|
||||
D 2024-09-26T14:09:23.248
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
F Makefile.in c9d2e625e2f79127e28e1691e4514ae3c2c426af650cb3e1d59737e89f66f7dc
|
||||
F Makefile.in 3806942cc072d2dd09568c530c614dee8274ce2663ba560f7af5271a088d944d
|
||||
F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
|
||||
F Makefile.msc e3c4723c27464acc31da4420b808c8d2690180ba2b915897bece0a9d5d2cecf6
|
||||
F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
|
||||
@ -46,7 +46,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
|
||||
F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
|
||||
F autosetup/cc.tcl 1b52de228642c1db5a714d54ca974d723ec8b4092e8c3765d348b625850f7311
|
||||
F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
|
||||
F autosetup/hwaci-common.tcl b2b8b94915baaa68f5355c3753835095da6290e0fccb22b6f5fa024a452400bc
|
||||
F autosetup/hwaci-common.tcl a112327a1eb29e3d32670e25a464832abb73f028b679a5433c4630446ca76b56
|
||||
F autosetup/jimsh0.c 1b5fe91fffcddbc29f2b16acb80f1650632ea2edbe8336b8155ef7b4c66f6d8d
|
||||
F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
|
||||
F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
|
||||
@ -2233,8 +2233,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 683a9e1e2f68a5c34fe524867576a4405fa2460880ad0bf4c07799744fea4192
|
||||
R ad6080b33e617c2bb00e20e12e921109
|
||||
P 7638f3ad1588ff16c2980763c6c4c1386a711acd64adb21c465f186a47bc975d
|
||||
R dd990ac14aacc7aef84cea962548e6de
|
||||
U stephan
|
||||
Z 6dde9c36df32e2200ff90b427b0efc9c
|
||||
Z 5264d306ffd6b34f18c75d08cd8d2866
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
@ -1 +1 @@
|
||||
7638f3ad1588ff16c2980763c6c4c1386a711acd64adb21c465f186a47bc975d
|
||||
65eb1072e297f01ba4ce21fe644f709e75ebaec5307764b549efceafb88f6ebf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user