change .do extension to .dbg.obj

so the compile MSVC wrapper script can recognize the extension

src/Makefile

@@ -30,7 +30,7 @@ DEBUG_LIBS = $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp-debug.a $(WHOLE_AR
 RELEASE_LIBS = $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a $(COMMON_LIBS)
 
 OBJS = $(SRCS:%=%.o)
-DOBJS = $(SRCS:%=%.do)
+DOBJS = $(SRCS:%=%.dbg.obj)
 DEBUGFLAGS += $(FLAGS)
 SHIPFLAGS += $(FLAGS)
 
@@ -50,14 +50,14 @@ HEADERS = julia.h julia_internal.h options.h $(wildcard support/*.h) $(LIBUV_INC
 
 %.o: %.c $(HEADERS)
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(CFLAGS) $(SHIPFLAGS) -DNDEBUG -c $< -o $@)
-%.do: %.c $(HEADERS)
+%.dbg.obj: %.c $(HEADERS)
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(CFLAGS) $(DEBUGFLAGS) -c $< -o $@)
 %.o: %.cpp $(HEADERS)
  @$(call PRINT_CC, $(CXX) $(call exec,$(LLVM_CONFIG) --cxxflags) $(CPPFLAGS) $(CXXFLAGS) $(SHIPFLAGS) -c $< -o $@)
-%.do: %.cpp $(HEADERS)
+%.dbg.obj: %.cpp $(HEADERS)
  @$(call PRINT_CC, $(CXX) $(call exec,$(LLVM_CONFIG) --cxxflags) $(CPPFLAGS) $(CXXFLAGS) $(DEBUGFLAGS) -c $< -o $@)
 
-ast.o ast.do: julia_flisp.boot.inc flisp/*.h
+ast.o ast.dbg.obj: julia_flisp.boot.inc flisp/*.h
 
 julia_flisp.boot.inc: julia_flisp.boot flisp/libflisp.a
  @$(call PRINT_FLISP, $(call spawn,./flisp/flisp) ./bin2hex.scm < $< > $@)
@@ -66,8 +66,8 @@ julia_flisp.boot: julia-parser.scm julia-syntax.scm \
  match.scm utils.scm jlfrontend.scm mk_julia_flisp_boot.scm flisp/libflisp.a
  @$(call PRINT_FLISP, $(call spawn,./flisp/flisp) ./mk_julia_flisp_boot.scm)
 
-codegen.o codegen.do: intrinsics.cpp debuginfo.cpp cgutils.cpp ccall.cpp disasm.cpp
-builtins.o builtins.do: table.c
+codegen.o codegen.dbg.obj: intrinsics.cpp debuginfo.cpp cgutils.cpp ccall.cpp disasm.cpp
+builtins.o builtins.dbg.obj: table.c
 
 support/libsupport.a: support/*.h support/*.c
  $(MAKE) -C support
@@ -114,7 +114,7 @@ libjulia-release: $(build_shlibdir)/libjulia.$(SHLIB_EXT)
 clean:
  -rm -f $(build_shlibdir)/libjulia*
  -rm -f julia_flisp.boot julia_flisp.boot.inc
- -rm -f *.do *.o *~ *# *.$(SHLIB_EXT) *.a
+ -rm -f *.dbg.obj *.o *~ *# *.$(SHLIB_EXT) *.a
 
 clean-flisp:
  -$(MAKE) -C flisp clean

src/flisp/Makefile

@@ -16,15 +16,15 @@ SRCS += basename.c dirname.c
 endif
 
 OBJS = $(SRCS:%.c=%.o)
-DOBJS = $(SRCS:%.c=%.do)
+DOBJS = $(SRCS:%.c=%.dbg.obj)
 LLTDIR = ../support
 LLT = $(LLTDIR)/libsupport.a $(LIBUV) $(LIBMOJIBAKE)
 
 FLAGS = -I$(LLTDIR) $(CFLAGS) $(HFILEDIRS:%=-I%) \
  -I$(LIBUV_INC) -I$(build_includedir) $(LIBDIRS:%=-L%) \
  -DLIBRARY_EXPORTS
 ifneq ($(USEMSVC), 1)
-FLAGS += -Wall -Wno-strict-aliasing -DUSE_COMPUTED_GOTO -fvisibility=hidden 
+FLAGS += -Wall -Wno-strict-aliasing -DUSE_COMPUTED_GOTO -fvisibility=hidden
 endif
 LIBFILES = $(LLT)
 LIBS = $(LIBFILES)
@@ -45,13 +45,13 @@ HEADERS = $(wildcard *.h) $(LIBUV_INC)/uv.h
 
 %.o: %.c $(HEADERS)
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(SHIPFLAGS) -DNDEBUG -c $< -o $@)
-%.do: %.c $(HEADERS)
+%.dbg.obj: %.c $(HEADERS)
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(DEBUGFLAGS) -c $< -o $@)
 
 flisp.o: flisp.c cvalues.c types.c flisp.h print.c read.c equal.c
-flisp.do: flisp.c cvalues.c types.c flisp.h print.c read.c equal.c
+flisp.dbg.obj: flisp.c cvalues.c types.c flisp.h print.c read.c equal.c
 flmain.o: flmain.c flisp.h
-flmain.do: flmain.c flisp.h
+flmain.dbg.obj: flmain.c flisp.h
 
 $(LLT): $(LLTDIR)/*.h $(LLTDIR)/*.c
  cd $(LLTDIR) && $(MAKE)
@@ -71,8 +71,8 @@ else
 CCLD = $(LD)
 endif
 
-$(EXENAME)-debug: $(DOBJS) $(LIBFILES) $(LIBTARGET)-debug.a flmain.do
- @$(call PRINT_LINK, $(CCLD) $(DEBUGFLAGS) $(DOBJS) flmain.do -o $(EXENAME)-debug $(LIBTARGET).a $(LIBS) $(OSLIBS))
+$(EXENAME)-debug: $(DOBJS) $(LIBFILES) $(LIBTARGET)-debug.a flmain.dbg.obj
+ @$(call PRINT_LINK, $(CCLD) $(DEBUGFLAGS) $(DOBJS) flmain.dbg.obj -o $(EXENAME)-debug $(LIBTARGET).a $(LIBS) $(OSLIBS))
 
 $(EXENAME): $(OBJS) $(LIBFILES) $(LIBTARGET).a flmain.o
  @$(call PRINT_LINK, $(CCLD) $(SHIPFLAGS) $(OBJS) flmain.o -o $(EXENAME) $(LIBTARGET).a $(LIBS) $(OSLIBS))
@@ -84,7 +84,7 @@ endif
 
 clean:
  rm -f *.o
- rm -f *.do
+ rm -f *.dbg.obj
  rm -f *.a
  rm -f $(EXENAME)
  rm -f $(EXENAME)-debug

src/support/Makefile

@@ -20,7 +20,7 @@ OBJS += _setjmp.win64.o _longjmp.win64.o
 endif
 endif
 
-DOBJS = $(OBJS:%.o=%.do)
+DOBJS = $(OBJS:%.o=%.dbg.obj)
 
 FLAGS = $(CFLAGS) $(HFILEDIRS:%=-I%) -I$(LIBUV_INC) -DLIBRARY_EXPORTS
 ifneq ($(USEMSVC), 1)
@@ -36,18 +36,18 @@ HEADERS = $(wildcard *.h) $(LIBUV_INC)/uv.h
 
 %.o: %.c $(HEADERS)
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(SHIPFLAGS) -DNDEBUG -c $< -o $@)
-%.do: %.c $(HEADERS)
+%.dbg.obj: %.c $(HEADERS)
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(DEBUGFLAGS) -c $< -o $@)
 ifneq ($(USEMSVC), 1)
 %.o: %.S
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(SHIPFLAGS) -c $< -o $@)
-%.do: %.S
+%.dbg.obj: %.S
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(DEBUGFLAGS) -c $< -o $@)
 else
 %.o: %.S
  @$(call PRINT_CC, $(CPP) -P $(CPPFLAGS) $(SHIPFLAGS) $<)
  @$(call PRINT_CC, $(AS) $(CPPFLAGS) $(SHIPFLAGS) -Fo$@ -c $*.i)
-%.do: %.S
+%.dbg.obj: %.S
  @$(call PRINT_CC, $(CPP) -P $(CPPFLAGS) $(DEBUGFLAGS) $<)
  @$(call PRINT_CC, $(AS) $(CPPFLAGS) $(DEBUGFLAGS) -Fo$@ -c $*.i)
 endif
@@ -65,7 +65,7 @@ libsupport-debug.a: $(DOBJS)
 
 clean:
  rm -f *.o
- rm -f *.do
+ rm -f *.dbg.obj
  rm -f *.a
  rm -f *~ *#
  rm -f core*

ui/.gitignore

@@ -1,3 +1,5 @@
 /*.o
 /*.do
 /*.dSYM
+/*.obj
+/*.pdb

ui/Makefile

@@ -17,7 +17,7 @@ FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer
 endif
 
 OBJS = $(SRCS:%=%.o)
-DOBJS = $(SRCS:%=%.do)
+DOBJS = $(SRCS:%=%.dbg.obj)
 DEBUGFLAGS += $(FLAGS)
 SHIPFLAGS += $(FLAGS)
 ifeq ($(USE_LLVM_SHLIB),1)
@@ -42,7 +42,7 @@ release debug:
 
 %.o: %.c
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(CFLAGS) $(SHIPFLAGS) -c $< -o $@)
-%.do: %.c
+%.dbg.obj: %.c
  @$(call PRINT_CC, $(CC) $(CPPFLAGS) $(CFLAGS) $(DEBUGFLAGS) -c $< -o $@)
 
 ifeq ($(OS),WINNT)
@@ -77,7 +77,7 @@ $(build_bindir)/julia-debug$(EXE): $(DOBJS)
  @$(call PRINT_LINK, $(CXXLD) $(CXXLDFLAGS) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia-debug $(JLDFLAGS) $(CXXLDFLAGS))
 
 clean: | $(CLEAN_TARGETS)
- rm -f *.o *.do
+ rm -f *.o *.dbg.obj
  rm -f $(build_bindir)/julia*
 
 .PHONY: clean release debug julia-release julia-debug