2.0.0 release admin change

Author: yianwillis

INSTALL

@@ -12,6 +12,7 @@
 |  UPDATE   |
 +-----------+
 
+2.0.0：更新到 Vim 8.0，
 1.9.0：更新到 Vim 7.4，
 1.8.0：更新到 Vim 7.3，
 1.7.0：更新到 Vim 7.2，新增 vimcdoc.vim 插件。

NEWS

@@ -1,3 +1,6 @@
+2.0.0 releated (17 Aug 2017) by Willis
+Fully updated to Vim 8.0.
+
 Migrated to github (7 Sep 2013) by Willis
 We are going to migrate our platform to github.com and future work will be
 performed there instead of sourceforge.net.

VERSION

@@ -1 +1 @@
-1.9.0
+2.0.0

common.aap

@@ -13,7 +13,7 @@ SF_SCP_RELEASE_URL  = scp://$SF_USER@$SF_RELEASE_DOMAIN/home/frs/project/vimcdoc
 # TOPLEVELDIR is defined externally.
 VERSION      = $TOPLEVELDIR/VERSION
 VCD          = vimcdoc
-MISC_FILES   = README INSTALL VERSION AUTHORS LICENSE dict.txt vimcdoc.sh TODO guides.txt ChangeLog
+MISC_FILES   = README.md INSTALL VERSION AUTHORS LICENSE dict.txt vimcdoc.sh TODO guides.txt ChangeLog
 @VERSION     = file2string( VERSION )
 DOC_DIR      = $TOPLEVELDIR/doc
 RELEASE_DIR  = $TOPLEVELDIR/release

doc/main.aap

@@ -8,7 +8,6 @@ TOPLEVELDIR = ..
 
 :rule %.txt {virtual}:
     :chmod 644 $target
-    :sys svn commit $target
     :sys ./vim2html.pl tags $target
     @html_file = sufreplace('.txt', '.html', target)
     :sys scp $html_file $(SF_SCP_WEB_URL)/doc

main.aap

@@ -12,7 +12,6 @@
 #   aap -f www/htdocs/main.aap publish (vimcdoc homepage)
 #
 # External tools we would need:
-#   svn2cl (needed for ChangeLog)
 #   nsis, ANSI (standard) and unicode (3.0 alpha needed)
 #	wine, if running from non-windows environment
 #   latex, latexmk
@@ -22,7 +21,7 @@ TOPLEVELDIR=.
 :include $TOPLEVELDIR/common.aap
 
 # ANSI NSIS, available from nsis.sourceforge.net/.
-MAKENSIS     = makensis
+MAKENSIS     = "c:\Program Files\NSIS2\makensis"
 # Unicode NSIS, available from offical NSIS 3.0a1 
 MAKENSIS_UNI = "c:\Program Files\NSIS\makensis"
 NSISFILE     = vcd-setup.nsi
@@ -64,11 +63,12 @@ release {virtual}: $RELEASE_NAME
 	#:move $target_name $RELEASE_NAME/doc
 	:copy $NSISFILE $NSISFILE_UNI $RELEASE_NAME
 	:cd $RELEASE_NAME
-	:sys $(MAKENSIS) $(NSISFILE)
 	os = $OSTYPE
 	@if os == "mswin":
+		:sys $(MAKENSIS) $(NSISFILE)
 		:sys $(MAKENSIS_UNI) $(NSISFILE_UNI)
 	@else:
+		:sys wine $(MAKENSIS) $(NSISFILE)
 		:sys wine $(MAKENSIS_UNI) $(NSISFILE_UNI)
 	:cd -
 	:move $RELEASE_NAME/$(VCD)-setup.exe $(RELEASE_DIR)/$(RELEASE_NAME)-setup.exe
@@ -84,8 +84,8 @@ $RELEASE_NAME: VERSION
 	:mkdir $RELEASE_NAME/doc
 	:copy $(MISC_FILES) $(RELEASE_NAME)
 
-ChangeLog: $Vimcdoc_txt 
-	:sys svn2cl --strip-prefix=/
+ChangeLog: $Vimcdoc_txt
+	:sys git log --date=short --pretty="format:%ad %aE %s%n" --name-only > ChangeLog
 
 all:
 	:print Use 'aap clean' to clean up.

tools/html2lex.c

@@ -1382,7 +1382,9 @@ bool norm_URL(origin, file) char *origin, *file;
             && s[0] == '.' && s[1] == '.' /* && s[2] == '/'*/)
             return FALSE;
         else if (i == 0)
-            strcpy(file, s);
+	{
+	    if (file != s) strcpy(file, s);
+	}
         else if(i + strlen(s) < MAX_DF)
         {   memcpy(df_buffer, origin, i); 
             strcpy(df_buffer + i, s);
@@ -4253,7 +4255,7 @@ bool included;    /* Included in output (or only checking) */
                     {    if(attr_name)
                             fprintf(fout, "\n%% <%s %s=\"%s\">\n", html_com, attr_name, attr_val); 
                         else
-                            fprintf(fout, "\n%%>\n", html_com); 
+                            fprintf(fout, "\n%% <%s>\n", html_com);
                     }
             }
             else if (OPEN_TAG(T_HTML))
@@ -4801,12 +4803,12 @@ char *fn;
                     bool is_link_mapping = ch == 'l';
 
                     ch = (char)fgetc(fin);
-                    parse_URL(fin, &ch, buffer, MAX_SF);
+                    parse_URL(fin, &ch, buffer);
 
                     new->prefix = SALLOC(buffer);
                     strcpy(new->prefix, buffer);
 
-                    parse_URL(fin, &ch, buffer, MAX_SF);
+                    parse_URL(fin, &ch, buffer);
 
                     new->replace = SALLOC(buffer);
                     strcpy(new->replace, buffer);
@@ -4867,7 +4869,7 @@ char *fn;
                 {   file_t *tfile;
 
                     ch = (char)fgetc(fin);
-                    parse_URL(fin, &ch, html_file, MAX_SF);
+                    parse_URL(fin, &ch, html_file);
 
                     tfile = find_file(html_file);
                     tfile->ignore = TRUE;
@@ -4881,7 +4883,7 @@ char *fn;
             }
             else
             {
-                parse_URL(fin, &ch, html_file, MAX_SF);
+                parse_URL(fin, &ch, html_file);
 
                 while (!feof(fin) && ch == ' ')
                     ch = (char)fgetc(fin);

vcd-setup-unicode.nsi

@@ -129,7 +129,7 @@ Section - DoStuff
     SetOutPath $INSTDIR\..\vimfiles\plugin
     File "vimcdoc.vim"
   SetOutPath $PROGRAMFILES\vimcdoc
-  File "README"
+  File "README.md"
   File "INSTALL"
   File "LICENSE"
   File "AUTHORS"

vcd-setup.nsi

@@ -124,7 +124,7 @@ Section - DoStuff
     SetOutPath $INSTDIR\..\vimfiles\plugin
     File "vimcdoc.vim"
   SetOutPath $PROGRAMFILES\vimcdoc
-  File "README"
+  File "README.md"
   File "INSTALL"
   File "LICENSE"
   File "AUTHORS"