Changes On Branch stephan
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch stephan Excluding Merge-Ins

This is equivalent to a diff from 2955cece33 to 0918d1f04a

2012-06-22
13:03
Minor Makefile hack to allow "make clean" to work from ./src/. check-in: 4e4b6cc35f user: stephan tags: trunk
12:58
MSC makefile fix for missing cson_amalgamation. Leaf check-in: 0918d1f04a user: stephan tags: stephan
2012-06-20
17:26
Remove an unused variable. check-in: 2955cece33 user: drh tags: trunk
17:24
Add the ability for an administrator to run raw SQL commands via the web interface. check-in: ca0faa88a4 user: drh tags: trunk

Changes to src/makemake.tcl.

   922    922   $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
   923    923   $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
   924    924   $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
   925    925   $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
   926    926   $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
   927    927   $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
   928    928   $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
          929  +$(OBJDIR)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.h
          930  +$(OBJDIR)\cson_amalgamation$(O): $(SRCDIR)\cson_amalgamation.c
          931  +	$(TCC) -c $(SRCDIR)\cson_amalgamation.c -o $(OBJDIR)\cson_amalgamation$(O) -DCSON_FOSSIL_MODE
   929    932   
   930    933   }
   931    934   foreach s [lsort $src] {
   932    935     writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
   933    936     writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
   934    937     writeln "${s}_.c : \$(SRCDIR)\\$s.c"
   935    938     writeln "\ttranslate\$E \$** > \$@\n"

Changes to win/Makefile.msc.

   215    215   $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
   216    216   $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
   217    217   $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
   218    218   $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
   219    219   $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
   220    220   $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h
   221    221   $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
          222  +$(OBJDIR)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.h
          223  +$(OBJDIR)\cson_amalgamation$(O): $(SRCDIR)\cson_amalgamation.c
          224  +	$(TCC) -c $(SRCDIR)\cson_amalgamation.c -o $(OBJDIR)\cson_amalgamation$(O) -DCSON_FOSSIL_MODE
   222    225   
   223    226   
   224    227   $(OX)\add$O : add_.c add.h
   225    228   	$(TCC) /Fo$@ -c add_.c
   226    229   
   227    230   add_.c : $(SRCDIR)\add.c
   228    231   	translate$E $** > $@