Revision: 832 http://svn.sourceforge.net/geany/?rev=832&view=rev Author: ntrel Date: 2006-09-22 05:09:53 -0700 (Fri, 22 Sep 2006)
Log Message: ----------- Let make clean continue when a file can't be deleted.
Modified Paths: -------------- trunk/ChangeLog trunk/makefile.win32 trunk/scintilla/makefile.win32 trunk/src/makefile.win32 trunk/tagmanager/makefile.win32
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-22 12:05:18 UTC (rev 831) +++ trunk/ChangeLog 2006-09-22 12:09:53 UTC (rev 832) @@ -1,16 +1,19 @@ 2006-09-22 Nick Treleaven nick.treleaven@btinternet.com
* src/main.c: Apply toolbar style on startup (Fixes #1563125). - * src/build.c src/geany.h: + * src/build.c, src/geany.h: Prevent a segfault if the Terminal tool is not set. Use cmd.exe as default Terminal tool on Windows. + * scintilla/makefile.win32, src/makefile.win32, + tagmanager/makefile.win32, makefile.win32: + Let make clean continue when a file can't be deleted.
2006-09-21 Nick Treleaven nick.treleaven@btinternet.com
* src/ui_utils.c: Fix a bug when clicking on a recent file. - * src/callbacks.c src/sciwrappers.c: + * src/callbacks.c, src/sciwrappers.c: Prevent a partial selection on a line being deleted when using CTRL-I to indent; also improve CTRL-Shift-I unindenting. Closes #1557963.
Modified: trunk/makefile.win32 =================================================================== --- trunk/makefile.win32 2006-09-22 12:05:18 UTC (rev 831) +++ trunk/makefile.win32 2006-09-22 12:09:53 UTC (rev 832) @@ -35,13 +35,13 @@ $(CP) $< $@
deps: - $(RM) tagmanager\deps.mak scintilla\deps.mak src\deps.mak + -$(RM) tagmanager\deps.mak scintilla\deps.mak src\deps.mak
# used by src/makefile.win32 to avoid del ../file which is an error clean-local: - $(RM) geany_private.res geany.exe + -$(RM) geany_private.res geany.exe
-clean: +clean: deps cd tagmanager && make -f makefile.win32 clean && cd .. cd scintilla && make -f makefile.win32 clean && cd .. cd src && make -f makefile.win32 clean && cd ..
Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2006-09-22 12:05:18 UTC (rev 831) +++ trunk/scintilla/makefile.win32 2006-09-22 12:09:53 UTC (rev 832) @@ -67,7 +67,7 @@ all: $(COMPLIB)
clean: - $(RM) deps.mak *.o $(COMPLIB) + -$(RM) deps.mak *.o $(COMPLIB)
$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2006-09-22 12:05:18 UTC (rev 831) +++ trunk/src/makefile.win32 2006-09-22 12:09:53 UTC (rev 832) @@ -59,7 +59,7 @@
# this calls parent clean-local target because del ../file won't work clean: - $(RM) deps.mak *.o + -$(RM) deps.mak *.o cd .. && make -f makefile.win32 clean-local && cd src
exec:
Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2006-09-22 12:05:18 UTC (rev 831) +++ trunk/tagmanager/makefile.win32 2006-09-22 12:09:53 UTC (rev 832) @@ -30,7 +30,7 @@ all: $(COMPLIB)
clean: - $(RM) deps.mak *.o $(COMPLIB) + -$(RM) deps.mak *.o $(COMPLIB)
$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o \ python.o regex.o sh.o ctags.o entry.o get.o keyword.o options.o parse.o \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.