From a4f9037d2a7f69406a8eabdc0e3553f093b254e9 Mon Sep 17 00:00:00 2001 From: AlDanial Date: Sat, 12 Sep 2020 09:41:36 -0700 Subject: [PATCH] v1.88 --- README.md | 33 ++++++++++++++++++++------------- Unix/NEWS | 30 ++++++++++++++++++++++++++++++ Unix/cloc | 5 ++--- cloc | 2 +- 4 files changed, 53 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 761f6081..8db3e6c4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ * * * cloc counts blank lines, comment lines, and physical lines of source code in many programming languages. -Latest release: v1.86 (May 18, 2020) +Latest release: v1.88 (Sept. 12, 2020) cloc moved to GitHub in September 2015 after being hosted at http://cloc.sourceforge.net/ since August 2006. @@ -57,8 +57,8 @@ Step 3: Invoke cloc to count your source files, directories, archives, or git commits. The executable name differs depending on whether you use the development source version (`cloc`), source for a -released version (`cloc-1.86.pl`) or a Windows executable -(`cloc-1.86.exe`). On this page, `cloc` is the generic term +released version (`cloc-1.88.pl`) or a Windows executable +(`cloc-1.88.exe`). On this page, `cloc` is the generic term used to refer to any of these. **a file** @@ -364,25 +364,23 @@ and Digest::MD5 installed locally. # [Building a Windows Executable ▲](#___top "click to go to top of document") The Windows downloads -cloc-1.86.exe was built on a 64 bit Windows 10 virtual machine -downloaded from https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/ +cloc-1.88.exe was built on a 64 bit Windows 10 computer using [Strawberry Perl](http://strawberryperl.com/) 5.30.2 and -[PAR::Packer](http://search.cpan.org/~rschupp/PAR-Packer-1.019/lib/pp.pm) +[PAR::Packer](http://search.cpan.org/~rschupp/PAR-Packer-1.050/lib/pp.pm) to build the `.exe`. -Releases 1.74 through 1.84 +Release 1.86 was built on a 64 bit Windows 10 virtual machine +downloaded from https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/; +releases 1.74 through 1.84 were was built on a 32 bit Windows 7 virtual machine using Strawberry Perl 5.26.1.1, while 1.70 and 1.72 were built with Strawberry Perl 5.24.0.1 on an Amazon Web Services t2.micro instance running Microsoft Windows Server 2008 (32 bit for 1.70 and 1.72; 64 bit for 1.74). - -The cloc-1.66.exe executable was built -on a 32 bit Windows 7 VirtualBox image. -Windows executables of cloc versions -1.60 and earlier were built with +Release 1.66 was built on a 32 bit Windows 7 VirtualBox image. +Windows executables of cloc versions 1.60 and earlier were built with [perl2exe](http://www.indigostar.com/perl2exe.htm) on a 32 bit Windows XP computer. A small modification was made to the cloc source code before passing it to perl2exe; lines 87 and 88 were uncommented: @@ -409,6 +407,9 @@ executable and also check sites such https://www.virustotal.com/ . The entries for recent versions are: +cloc-1.88.exe: +https://www.virustotal.com/gui/file/97d5d2631d1cccdbfd99267ab8a4cf5968816bbe52c0f9324e72e768857f642d/detection + cloc-1.86.exe: https://www.virustotal.com/gui/file/1b2e189df1834411b34534db446330d1c379b4bc008af3042ee9ade818c6a1c8/detection @@ -1050,6 +1051,7 @@ Java (java) JavaScript (_js, bones, es6, jake, jakefile, js, jsb, jscad, jsfl, jsm, jss, mjs, njs, pac, sjs, ssjs, xsjs, xsjslib) JavaServer Faces (jsf) JCL (jcl) +Jinja Template (jinja, jinja2) JSON (arcconfig, avsc, composer.lock, geojson, gltf, har, htmlhintrc, json, json-tmlanguage, jsonl, mcmeta, mcmod.info, tern-config, tern-project, tfstate, tfstate.backup, topojson, watchmanconfig, webapp, webmanifest, yyp) JSON5 (json5) JSP (jsp, jspf) @@ -1068,6 +1070,7 @@ Lisp (asd, el, lisp, lsp, cl, jl) Literate Idris (lidr) LiveLink OScript (oscript) LLVM IR (ll) +Logos (x, xm) Logtalk (lgt, logtalk) Lua (lua, nse, p8, pd_lua, rbxs, wlua) m4 (ac, m4) @@ -1079,6 +1082,7 @@ MATLAB (m) Maven (pom, pom.xml) Meson (meson.build) Modula3 (i3, ig, m3, mg) +Mojo (mojom) MSBuild script (csproj, vbproj, vcproj, wdproj, wixproj) MUMPS (mps, m) Mustache (mustache) @@ -1091,6 +1095,7 @@ Nix (nix) Objective-C (m) Objective-C++ (mm) OCaml (eliom, eliomi, ml, ml4, mli, mll, mly) +Odin (odin) OpenCL (cl) Oracle Forms (fmt) Oracle PL/SQL (bod, fnc, prc, spc, trg) @@ -1180,7 +1185,7 @@ Velocity Template Language (vm) Verilog-SystemVerilog (sv, svh, v) VHDL (VHD, vhd, VHDL, vhdl, vhf, vhi, vho, vhs, vht, vhw) vim script (vim) -Visual Basic (bas, ctl, dsr, frm, frx, VB, vb, VBA, vba, vbhtml, VBS, vbs, cls) +Visual Basic (BAS, bas, ctl, dsr, frm, FRX, frx, VB, vb, VBA, vba, VBHTML, vbhtml, VBS, vbs, cls) Visual Fox Pro (SCA, sca) Visualforce Component (component) Visualforce Page (page) @@ -1192,6 +1197,8 @@ Windows Resource File (rc, rc2) WiX include (wxi) WiX source (wxs) WiX string localization (wxl) +WXML (wxml) +WXSS (wxss) XAML (xaml) xBase (prg, prw) xBase Header (ch) diff --git a/Unix/NEWS b/Unix/NEWS index 360df30d..b476b761 100644 --- a/Unix/NEWS +++ b/Unix/NEWS @@ -1,3 +1,33 @@ + Release Notes for cloc version 1.88 + https://github.com/AlDanial/cloc + Sept. 12, 2020 + +New Languages and File Types: + o LLVM IR + o Logos + o Meson + o Mojo + o Odin + o Jinja Templates + o WXML + o WXSS + +Updates: + o Support MATLAB block comments. + o More flexible matching of git hashes. + o Case insensitive diff file alignment on Windows. + o Add .BAS as a Visual Basic extension + o Rename Objective C to Objective-C + +Bug Fixes: + o Add missing Raku_or_Prolog() subroutine. + o Handle UTF encoded list files (file given to --list-file). + o Improved support for options parsing from config file. + o Catch unidentified files via --diff-list-file. + o Don't insert extra newlines when stripping with --unicode. + +============================================================================ + Release Notes for cloc version 1.86 Release Notes for cloc version 1.86 https://github.com/AlDanial/cloc May 17, 2020 diff --git a/Unix/cloc b/Unix/cloc index 628dcbd6..d8e96276 100755 --- a/Unix/cloc +++ b/Unix/cloc @@ -29,7 +29,7 @@ # . # # 1}}} -my $VERSION = "1.87"; # odd number == beta; even number == stable +my $VERSION = "1.88"; # odd number == beta; even number == stable my $URL = "github.com/AlDanial/cloc"; # 'https://' pushes header too wide require 5.006; # use modules {{{1 @@ -5030,7 +5030,6 @@ sub make_file_list { # {{{1 my @dir_list = (); foreach my $file_or_dir (@{$ra_arg_list}) { -#print "make_file_list file_or_dir=$file_or_dir\n"; my $size_in_bytes = 0; if (!-r $file_or_dir) { push @{$raa_errors}, [$rh_Err->{'Unable to read'} , $file_or_dir]; @@ -12964,7 +12963,7 @@ sub load_from_config_file { # {{{1 else { ${$rs_v} = $4; } } elsif (!$has_script_lang and /^(?:script_lang|script-lang)(=|\s+)(.*?)$/) { push @{$ra_script_lang} , $2; - } elsif (!$has_force_lang and /^(?:force_lang|force-lang)(=|\s+)(.*?)$/) { + } elsif (!$has_force_lang and /^(?:force_lang|force-lang)(=|\s+)(.*?)$/) { push @{$ra_force_lang} , $2; } elsif (!defined ${$rs_show_ext} and /^(show_ext|show-ext)((=|\s+)(.*))?$/) { if (!defined $4) { ${$rs_show_ext} = 0; } diff --git a/cloc b/cloc index 2d8bbbb6..31c8524b 100755 --- a/cloc +++ b/cloc @@ -29,7 +29,7 @@ # . # # 1}}} -my $VERSION = "1.87"; # odd number == beta; even number == stable +my $VERSION = "1.88"; # odd number == beta; even number == stable my $URL = "github.com/AlDanial/cloc"; # 'https://' pushes header too wide require 5.006; # use modules {{{1