make: use older mktemp, more #60080
+58
−41
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -75,26 +75,28 @@ DIRS = $(build_bindir) $(build_libdir) | |||||||||||
| $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir)))) | ||||||||||||
|
|
||||||||||||
| ifeq ($(OS),WINNT) | ||||||||||||
| $(BUILDDIR)/julia_res.o $(BUILDDIR)/julia_res_debug.o: $(JULIAHOME)/contrib/windows/julia.rc $(JULIAHOME)/VERSION | ||||||||||||
| JLVER=`cat $(JULIAHOME)/VERSION` && \ | ||||||||||||
| JLVERi=`echo $$JLVER | perl -nle \ | ||||||||||||
| '/^(\d+)\.?(\d*)\.?(\d*)/ && \ | ||||||||||||
| print int $$1,",",int $$2,",",int $$3,",0"'` && \ | ||||||||||||
| $(CROSS_COMPILE)windres $< -O coff -o $@ -DJLVER=$$JLVERi -DJLVER_STR=\\\"$$JLVER\\\" | ||||||||||||
| EXE_OBJS += $(BUILDDIR)/julia_res.o | ||||||||||||
| EXE_DOBJS += $(BUILDDIR)/julia_res_debug.o | ||||||||||||
| endif | ||||||||||||
|
|
||||||||||||
| # Embed an Info.plist in the julia executable | ||||||||||||
| # Create an intermediate target Info.plist for Darwin code signing. | ||||||||||||
| ifeq ($(DARWIN_FRAMEWORK),1) | ||||||||||||
| $(BUILDDIR)/Info.plist: $(JULIAHOME)/VERSION | ||||||||||||
| @TMPFILE=$$(mktemp $(abspath [email protected])); \ | ||||||||||||
| /usr/libexec/PlistBuddy -x -c "Clear dict" $$TMPFILE; \ | ||||||||||||
| /usr/libexec/PlistBuddy -x -c "Add :CFBundleName string julia" $$TMPFILE; \ | ||||||||||||
| /usr/libexec/PlistBuddy -x -c "Add :CFBundleIdentifier string $(darwin_codesign_id_julia_ui)" $$TMPFILE; \ | ||||||||||||
| /usr/libexec/PlistBuddy -x -c "Add :CFBundleInfoDictionaryVersion string 6.0" $$TMPFILE; \ | ||||||||||||
| /usr/libexec/PlistBuddy -x -c "Add :CFBundleVersion string $(JULIA_COMMIT)" $$TMPFILE; \ | ||||||||||||
| /usr/libexec/PlistBuddy -x -c "Add :CFBundleShortVersionString string $(JULIA_MAJOR_VERSION).$(JULIA_MINOR_VERSION).$(JULIA_PATCH_VERSION)" $$TMPFILE; \ | ||||||||||||
| mv $$TMPFILE $@ | ||||||||||||
| .INTERMEDIATE: $(BUILDDIR)/Info.plist # cleanup this file after we are done using it | ||||||||||||
| JLDFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,Info.plist | ||||||||||||
| $(build_bindir)/julia$(EXE): $(BUILDDIR)/Info.plist | ||||||||||||
|
|
@@ -151,11 +153,13 @@ $(build_bindir)/julia-debug$(EXE): $(EXE_DOBJS) $(build_shlibdir)/libjulia-debug | |||||||||||
| @$(call PRINT_LINK, $(CC) $(LOADER_CFLAGS) $(DEBUGFLAGS) $(EXE_DOBJS) -o $@ $(LOADER_LDFLAGS) $(RPATH) -ljulia-debug) | ||||||||||||
|
|
||||||||||||
| $(BUILDDIR)/julia.expmap: $(SRCDIR)/julia.expmap.in $(JULIAHOME)/VERSION | ||||||||||||
| @TMPFILE=$$(mktemp $(abspath [email protected])); \ | ||||||||||||
| sed <'$<' >$$TMPFILE -e 's/@JULIA_SHLIB_SYMBOL_VERSION@/JL_LIBJULIA_$(SOMAJOR)/'; \ | ||||||||||||
| mv $$TMPFILE $@ | ||||||||||||
|
Comment on lines
+156
to
+158
Member
There was a problem hiding this comment. How about we add a new helper script like this (created via ChatGPT, just to keep it interesting ;-)), stored as, say, #!/bin/sh
# Atomic write-if-different helper
# Usage: atomic_write_if_different.sh TARGET
set -eu
target=$1
tmp=$(mktemp "${target}.XXXXXX") || exit 1
# Ensure temporary file gets cleaned up on exit or interrupt
cleanup() {
rm -f "$tmp"
}
trap cleanup EXIT INT TERM HUP
# Read stdin to the temporary file
cat > "$tmp"
# If target does not exist, move new file into place
if [ ! -f "$target" ]; then
mv "$tmp" "$target"
trap - EXIT
exit 0
fi
# Compare old and new; only replace if different
if cmp -s "$tmp" "$target"; then
# identical
rm -f "$tmp"
else
mv "$tmp" "$target"
fi
trap - EXIT
exit 0Then here we can write
Suggested change
The result has more comprehensive functionality and is arguably easier to read and maintain -- I think this is more visible in some of the other places.
Member
Author
There was a problem hiding this comment. I do like that. We need to be careful though, since half of the places we use this, the "if different" policy should not be applied, while the other half it should be (and a few don't care) |
||||||||||||
|
|
||||||||||||
| clean: | $(CLEAN_TARGETS) | ||||||||||||
| rm -f $(BUILDDIR)/*.o $(BUILDDIR)/*.dbg.obj | ||||||||||||
| rm -f $(build_bindir)/julia* | ||||||||||||
| rm -f $(BUILDDIR)/julia.expmap* | ||||||||||||
|
|
||||||||||||
| .PHONY: clean release debug julia-release julia-debug | ||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -273,19 +273,23 @@ $(BUILDDIR)/%.h.gen : $(SRCDIR)/%.d | |
| sed 's/JULIA_/JL_PROBE_/' $@ > [email protected] | ||
| mv [email protected] $@ | ||
|
|
||
| # Generate `.inc` file that contains a list of `#define` macros to rename functions defined in `libjulia-internal` | ||
| # to have a `ijl_` prefix instead of `jl_`, to denote that they are coming from `libjulia-internal`. This avoids | ||
| # potential confusion with debugging tools, when inspecting a process that has both `libjulia` and `libjulia-internal` | ||
| # loaded at the same time. | ||
| $(BUILDDIR)/jl_internal_funcs.inc: $(SRCDIR)/jl_exported_funcs.inc | ||
| @TMPFILE=$$(mktemp $(abspath [email protected])); \ | ||
| grep 'XX(..*)' $< | sed -E 's/.*XX\((.+)\).*/#define \1 i\1/g' > $$TMPFILE; \ | ||
| mv $$TMPFILE $@ | ||
|
|
||
| # Generate `.inc` file that contains a list of `#define` macros to access global data through struct instances | ||
| $(BUILDDIR)/jl_data_globals_defs.inc: $(SRCDIR)/jl_exported_data.inc | ||
| @TMPFILE=$$(mktemp $(abspath [email protected])); \ | ||
| { \ | ||
| grep 'XX(.*)' $< | sed -E 's/.*XX\(([^,]+), .*\).*/#define jl_\1 (sysimg_global.\1)/g'; \ | ||
| grep 'YY(.*)' $< | sed -E 's/.*YY\(([^,]+), .*\).*/#define jl_\1 (const_globals.jl\1)/g'; \ | ||
| } > $$TMPFILE; \ | ||
| mv $$TMPFILE $@ | ||
|
|
||
| # source file rules | ||
| $(BUILDDIR)/%.o: $(SRCDIR)/%.c $(HEADERS) | $(BUILDDIR) | ||
|
|
@@ -352,13 +356,17 @@ $(build_shlibdir)/libllvmcalltest.$(SHLIB_EXT): $(SRCDIR)/llvmcalltest.cpp $(LLV | |
| julia_flisp.boot.inc.phony: $(BUILDDIR)/julia_flisp.boot.inc | ||
|
|
||
| $(BUILDDIR)/julia_flisp.boot.inc: $(BUILDDIR)/julia_flisp.boot $(FLISP_EXECUTABLE_release) | ||
| @$(call PRINT_FLISP, TMPFILE=$$(mktemp $(abspath [email protected])); \ | ||
| $(call spawn,$(FLISP_EXECUTABLE_release)) $(call cygpath_w,$(SRCDIR)/bin2hex.scm) < $< > $$TMPFILE; \ | ||
| mv $$TMPFILE $@) | ||
|
|
||
| $(BUILDDIR)/julia_flisp.boot: $(addprefix $(SRCDIR)/,jlfrontend.scm flisp/aliases.scm flisp/profile.scm \ | ||
| julia-parser.scm julia-syntax.scm match.scm utils.scm ast.scm macroexpand.scm mk_julia_flisp_boot.scm) \ | ||
| $(FLISP_EXECUTABLE_release) | ||
| @$(call PRINT_FLISP, TMPFILE=$$(mktemp $(abspath [email protected])); \ | ||
| $(call spawn,$(FLISP_EXECUTABLE_release)) \ | ||
| $(call cygpath_w,$(SRCDIR)/mk_julia_flisp_boot.scm) $(call cygpath_w,$(dir $<)) $(notdir $<) $(call cygpath_w,$$TMPFILE); \ | ||
| mv $$TMPFILE $@) | ||
|
|
||
| # additional dependency links | ||
| $(BUILDDIR)/codegen-stubs.o $(BUILDDIR)/codegen-stubs.dbg.obj: $(addprefix $(SRCDIR)/,intrinsics.h llvm-julia-passes.inc) | ||
|
|
@@ -427,23 +435,28 @@ $(BUILDDIR)/flisp/libflisp-debug.a: $(addprefix $(SRCDIR)/,flisp/*.h flisp/*.c) | |
| $(MAKE) -C $(SRCDIR)/flisp debug BUILDDIR='$(abspath $(BUILDDIR)/flisp)' | ||
|
|
||
| $(BUILDDIR)/julia_version.h: $(JULIAHOME)/VERSION | ||
| @TMPFILE=$$(mktemp $(abspath [email protected])); \ | ||
| { \ | ||
| echo "// This is an autogenerated header file"; \ | ||
| echo "#ifndef JL_VERSION_H"; \ | ||
| echo "#define JL_VERSION_H"; \ | ||
| echo "#define JULIA_VERSION_STRING" \"$(JULIA_VERSION)\"; \ | ||
| echo $(JULIA_VERSION) | awk 'BEGIN {FS="[.,+-]"} \ | ||
| {print "#define JULIA_VERSION_MAJOR " $$1 "\n" \ | ||
| "#define JULIA_VERSION_MINOR " $$2 "\n" \ | ||
| "#define JULIA_VERSION_PATCH " $$3 ; \ | ||
| if (NF<4) print "#define JULIA_VERSION_IS_RELEASE 1" ; else print "#define JULIA_VERSION_IS_RELEASE 0"}'; \ | ||
| echo "#endif"; \ | ||
| } > $$TMPFILE; \ | ||
| mv $$TMPFILE $@ | ||
|
|
||
| CXXLD = $(CXX) -shared | ||
|
|
||
| $(BUILDDIR)/julia.expmap: $(SRCDIR)/julia.expmap.in $(JULIAHOME)/VERSION $(LLVM_CONFIG_ABSOLUTE) | ||
| @TMPFILE=$$(mktemp $(abspath [email protected])); \ | ||
| sed <'$<' >$$TMPFILE -e "s/@JULIA_SHLIB_SYMBOL_VERSION@/JL_LIBJULIA_$(SOMAJOR)/" \ | ||
| -e "s/@LLVM_SHLIB_SYMBOL_VERSION@/$(LLVM_SHLIB_SYMBOL_VERSION)/"; \ | ||
| mv $$TMPFILE $@ | ||
|
|
||
| $(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV) | ||
| @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(SHIPFLAGS) $(JCXXFLAGS) $(CXXLDFLAGS) $(OBJS) $(RPATH_LIB) -o $@ \ | ||
|
|
@@ -554,11 +567,11 @@ INCLUDED_CXX_FILES := \ | |
| clean: | ||
| -rm -fr $(build_shlibdir)/libjulia-internal* $(build_shlibdir)/libjulia-codegen* | ||
| -rm -rf $(build_shlibdir)/libccalltest* $(build_shlibdir)/libllvmcalltest* $(build_shlibdir)/libccalllazyfoo* $(build_shlibdir)/libccalllazybar* | ||
| -rm -f $(BUILDDIR)/julia_flisp.boot* $(BUILDDIR)/julia_flisp.boot.inc* $(BUILDDIR)/jl_internal_funcs.inc* $(BUILDDIR)/jl_data_globals_defs.inc* | ||
| -rm -f $(BUILDDIR)/*.dbg.obj $(BUILDDIR)/*.o $(BUILDDIR)/*.dwo $(BUILDDIR)/*.$(SHLIB_EXT) $(BUILDDIR)/*.a $(BUILDDIR)/*.h.gen | ||
| -rm -f $(BUILDDIR)/julia.expmap* | ||
| -rm -f $(BUILDDIR)/julia_version.h | ||
| -rm -f $(BUILDDIR)/compile_commands.json* | ||
|
|
||
| clean-flisp: | ||
| -$(MAKE) -C $(SRCDIR)/flisp clean BUILDDIR='$(abspath $(BUILDDIR)/flisp)' | ||
|
|
@@ -657,7 +670,7 @@ clean-analyzegc: | |
| # Compilation database generation using existing clang infrastructure | ||
| .PHONY: regenerate-compile_commands | ||
| regenerate-compile_commands: | ||
| @TMPFILE=$$(mktemp $(abspath $(BUILDDIR)/compile_commands.json.XXXXXX)); \ | ||
| { \ | ||
| CLANG_TOOLING_C_FLAGS="$$($(JULIAHOME)/contrib/escape_json.sh clang $(CLANG_TOOLING_C_FLAGS))"; \ | ||
| CLANG_TOOLING_CXX_FLAGS="$$($(JULIAHOME)/contrib/escape_json.sh clang $(CLANG_TOOLING_CXX_FLAGS))"; \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead we could also just do a single
PlistBuddyinvocation