Skip to content

Import Version 1.7 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
the-reverend wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Import Version 1.7 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7e873a
Import Version 1.7
the-reverend Mar 17, 2023
858e3f0
Documentation updates for Version 1.7
the-reverend Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011 Neil Butterworth
Copyright (c) 2014 Neil Butterworth

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
62 changes: 30 additions & 32 deletions Makefile
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
ifndef COMSPEC
CLEAN = (cd alib; $(MAKE) clean) && (cd csvfix; $(MAKE) clean)
else
CLEAN = cmd.exe /c "clean.cmd"
endif

default:
@echo "use 'make win', 'make lin' or 'make mac'"

win:
cmd.exe /c "mkdirs.cmd"
cd alib && $(MAKE) win
cd csvfix && $(MAKE) win
cd csvfix/bin; gzip csvfix.exe -c > csvfix.win64.gz

lin:
mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
cd alib; $(MAKE) lin
cd csvfix; $(MAKE) lin
cd csvfix/bin; gzip csvfix -c > csvfix.linux-amd64.gz

# build for mac on Mountain Lion
# see http://groups.google.com/group/csvfix/browse_thread/thread/33ec3e5f157c16dd
mac:
mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
cd alib; $(MAKE) lin CCTYPE=clang
cd csvfix; $(MAKE) lin CCTYPE=clang
cd csvfix/bin; gzip csvfix -c > csvfix.osx.gz


clean:
$(CLEAN)
ifndef COMSPEC
CLEAN = (cd alib; $(MAKE) clean) && (cd csvfix; $(MAKE) clean)
else
CLEAN = cmd.exe /c "clean.cmd"
endif

SHELL := bash

default:
@echo "use 'make win', 'make lin' or 'make mac'"

win:
cmd.exe /c "mkdirs.cmd"
cd alib && $(MAKE) win
cd csvfix && $(MAKE) win

lin:
mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
cd alib; $(MAKE) lin
cd csvfix; $(MAKE) lin

# build for mac on Mountain Lion
# see http://groups.google.com/group/csvfix/browse_thread/thread/33ec3e5f157c16dd
mac:
mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
cd alib; $(MAKE) lin CCTYPE=clang
cd csvfix; $(MAKE) lin CCTYPE=clang

clean:
$(CLEAN)
7 changes: 5 additions & 2 deletions alib/Makefile
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ _OBJS = a_chsrc.o a_csv.o a_enc.o a_env.o a_except.o \

OBJS = $(patsubst %,$(ODIR)/%,$(_OBJS))

_WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o
_WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o a_winenv.o
WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))

_LINOBJS = a_linenv.o
LINOBJS = $(patsubst %,$(ODIR)/%,$(_LINOBJS))

_EXPAT = xmlparse.o xmlrole.o xmltok.o xmltok_impl.o xmltok_ns.o
EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))

Expand All @@ -38,7 +41,7 @@ $(ODIR)/%.o: $(XDIR)/%.cpp
win: $(OBJS) $(EXPAT) $(WINOBJS)
ar rvs $(OUT) $^

lin: $(OBJS) $(EXPAT)
lin: $(OBJS) $(EXPAT) $(LINOBJS)
ar rvs $(OUT) $^

.PHONY: clean
Expand Down
215 changes: 108 additions & 107 deletions alib/alib.cbp
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option output="bin\Debug\test.exe" prefix_auto="0" extension_auto="0" />
<Option working_dir="..\alib" />
<Option object_output="obj\Debug\" />
<Option output="bin/Debug/test.exe" prefix_auto="0" extension_auto="0" />
<Option working_dir="../alib" />
<Option object_output="obj/Debug/" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add option="-DALIB_TEST" />
</Compiler>
Expand All @@ -22,9 +21,9 @@
</Linker>
</Target>
<Target title="Release">
<Option output="libalib" prefix_auto="1" extension_auto="1" />
<Option output="alib" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="obj\Release\" />
<Option object_output="obj/Release/" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
Expand All @@ -45,107 +44,109 @@
<Add directory="inc" />
<Add directory="expat" />
</Compiler>
<Unit filename="expat\ascii.h" />
<Unit filename="expat\asciitab.h" />
<Unit filename="expat\expat.h" />
<Unit filename="expat\expat_external.h" />
<Unit filename="expat\iasciitab.h" />
<Unit filename="expat\internal.h" />
<Unit filename="expat\latin1tab.h" />
<Unit filename="expat\macconfig.h" />
<Unit filename="expat\nametab.h" />
<Unit filename="expat\utf8tab.h" />
<Unit filename="expat\winconfig.h" />
<Unit filename="expat\xmlparse.cpp" />
<Unit filename="expat\xmlrole.cpp" />
<Unit filename="expat\xmlrole.h" />
<Unit filename="expat\xmltok.cpp" />
<Unit filename="expat\xmltok.h" />
<Unit filename="expat\xmltok_impl.cpp" />
<Unit filename="expat\xmltok_impl.h" />
<Unit filename="expat\xmltok_ns.cpp" />
<Unit filename="inc\a_assert.h" />
<Unit filename="inc\a_base.h" />
<Unit filename="inc\a_chsrc.h" />
<Unit filename="inc\a_collect.h" />
<Unit filename="inc\a_csv.h" />
<Unit filename="inc\a_date.h" />
<Unit filename="inc\a_db.h" />
<Unit filename="inc\a_debug.h" />
<Unit filename="inc\a_dict.h" />
<Unit filename="inc\a_dir.h" />
<Unit filename="inc\a_enc.h" />
<Unit filename="inc\a_env.h" />
<Unit filename="inc\a_except.h" />
<Unit filename="inc\a_exec.h" />
<Unit filename="inc\a_expr.h" />
<Unit filename="inc\a_file.h" />
<Unit filename="inc\a_html.h" />
<Unit filename="inc\a_inifile.h" />
<Unit filename="inc\a_io.h" />
<Unit filename="inc\a_log.h" />
<Unit filename="inc\a_math.h" />
<Unit filename="inc\a_matrix.h" />
<Unit filename="inc\a_myth.h" />
<Unit filename="inc\a_nameval.h" />
<Unit filename="inc\a_nullstream.h" />
<Unit filename="inc\a_opsys.h" />
<Unit filename="inc\a_rand.h" />
<Unit filename="inc\a_range.h" />
<Unit filename="inc\a_regex.h" />
<Unit filename="inc\a_shstr.h" />
<Unit filename="inc\a_slice.h" />
<Unit filename="inc\a_sort.h" />
<Unit filename="inc\a_str.h" />
<Unit filename="inc\a_strscan.h" />
<Unit filename="inc\a_table.h" />
<Unit filename="inc\a_time.h" />
<Unit filename="inc\a_util.h" />
<Unit filename="inc\a_valptr.h" />
<Unit filename="inc\a_win.h" />
<Unit filename="inc\a_winerr.h" />
<Unit filename="inc\a_xmlevents.h" />
<Unit filename="inc\a_xmlparser.h" />
<Unit filename="inc\a_xmltree.h" />
<Unit filename="src\a_chsrc.cpp" />
<Unit filename="src\a_collect.cpp" />
<Unit filename="src\a_csv.cpp" />
<Unit filename="src\a_date.cpp" />
<Unit filename="src\a_db.cpp" />
<Unit filename="src\a_debug.cpp" />
<Unit filename="src\a_dir.cpp" />
<Unit filename="src\a_enc.cpp" />
<Unit filename="src\a_env.cpp" />
<Unit filename="src\a_except.cpp" />
<Unit filename="src\a_exec.cpp" />
<Unit filename="src\a_expr.cpp" />
<Unit filename="src\a_file.cpp" />
<Unit filename="src\a_html.cpp" />
<Unit filename="src\a_inifile.cpp" />
<Unit filename="src\a_io.cpp" />
<Unit filename="src\a_log.cpp" />
<Unit filename="src\a_math.cpp" />
<Unit filename="src\a_matrix.cpp" />
<Unit filename="src\a_myth.cpp" />
<Unit filename="src\a_nameval.cpp" />
<Unit filename="src\a_nullstream.cpp" />
<Unit filename="src\a_opsys.cpp" />
<Unit filename="src\a_rand.cpp" />
<Unit filename="src\a_range.cpp" />
<Unit filename="src\a_regex.cpp" />
<Unit filename="src\a_shstr.cpp" />
<Unit filename="src\a_slice.cpp" />
<Unit filename="src\a_sort.cpp" />
<Unit filename="src\a_str.cpp" />
<Unit filename="src\a_strscan.cpp" />
<Unit filename="src\a_table.cpp" />
<Unit filename="src\a_time.cpp" />
<Unit filename="src\a_util.cpp" />
<Unit filename="src\a_winerr.cpp" />
<Unit filename="src\a_xmlevents.cpp" />
<Unit filename="src\a_xmlparser.cpp" />
<Unit filename="src\a_xmltree.cpp" />
<Unit filename="src\test_main.cpp" />
<Unit filename="expat/ascii.h" />
<Unit filename="expat/asciitab.h" />
<Unit filename="expat/expat.h" />
<Unit filename="expat/expat_external.h" />
<Unit filename="expat/iasciitab.h" />
<Unit filename="expat/internal.h" />
<Unit filename="expat/latin1tab.h" />
<Unit filename="expat/macconfig.h" />
<Unit filename="expat/nametab.h" />
<Unit filename="expat/utf8tab.h" />
<Unit filename="expat/winconfig.h" />
<Unit filename="expat/xmlparse.cpp" />
<Unit filename="expat/xmlrole.cpp" />
<Unit filename="expat/xmlrole.h" />
<Unit filename="expat/xmltok.cpp" />
<Unit filename="expat/xmltok.h" />
<Unit filename="expat/xmltok_impl.cpp" />
<Unit filename="expat/xmltok_impl.h" />
<Unit filename="expat/xmltok_ns.cpp" />
<Unit filename="inc/a_assert.h" />
<Unit filename="inc/a_base.h" />
<Unit filename="inc/a_chsrc.h" />
<Unit filename="inc/a_collect.h" />
<Unit filename="inc/a_csv.h" />
<Unit filename="inc/a_date.h" />
<Unit filename="inc/a_db.h" />
<Unit filename="inc/a_debug.h" />
<Unit filename="inc/a_dict.h" />
<Unit filename="inc/a_dir.h" />
<Unit filename="inc/a_enc.h" />
<Unit filename="inc/a_env.h" />
<Unit filename="inc/a_except.h" />
<Unit filename="inc/a_exec.h" />
<Unit filename="inc/a_expr.h" />
<Unit filename="inc/a_file.h" />
<Unit filename="inc/a_html.h" />
<Unit filename="inc/a_inifile.h" />
<Unit filename="inc/a_io.h" />
<Unit filename="inc/a_log.h" />
<Unit filename="inc/a_math.h" />
<Unit filename="inc/a_matrix.h" />
<Unit filename="inc/a_myth.h" />
<Unit filename="inc/a_nameval.h" />
<Unit filename="inc/a_nullstream.h" />
<Unit filename="inc/a_opsys.h" />
<Unit filename="inc/a_rand.h" />
<Unit filename="inc/a_range.h" />
<Unit filename="inc/a_regex.h" />
<Unit filename="inc/a_shstr.h" />
<Unit filename="inc/a_slice.h" />
<Unit filename="inc/a_sort.h" />
<Unit filename="inc/a_str.h" />
<Unit filename="inc/a_strscan.h" />
<Unit filename="inc/a_table.h" />
<Unit filename="inc/a_time.h" />
<Unit filename="inc/a_util.h" />
<Unit filename="inc/a_valptr.h" />
<Unit filename="inc/a_win.h" />
<Unit filename="inc/a_winenv.h" />
<Unit filename="inc/a_winerr.h" />
<Unit filename="inc/a_xmlevents.h" />
<Unit filename="inc/a_xmlparser.h" />
<Unit filename="inc/a_xmltree.h" />
<Unit filename="src/a_chsrc.cpp" />
<Unit filename="src/a_collect.cpp" />
<Unit filename="src/a_csv.cpp" />
<Unit filename="src/a_date.cpp" />
<Unit filename="src/a_db.cpp" />
<Unit filename="src/a_debug.cpp" />
<Unit filename="src/a_dir.cpp" />
<Unit filename="src/a_enc.cpp" />
<Unit filename="src/a_env.cpp" />
<Unit filename="src/a_except.cpp" />
<Unit filename="src/a_exec.cpp" />
<Unit filename="src/a_expr.cpp" />
<Unit filename="src/a_file.cpp" />
<Unit filename="src/a_html.cpp" />
<Unit filename="src/a_inifile.cpp" />
<Unit filename="src/a_io.cpp" />
<Unit filename="src/a_log.cpp" />
<Unit filename="src/a_math.cpp" />
<Unit filename="src/a_matrix.cpp" />
<Unit filename="src/a_myth.cpp" />
<Unit filename="src/a_nameval.cpp" />
<Unit filename="src/a_nullstream.cpp" />
<Unit filename="src/a_opsys.cpp" />
<Unit filename="src/a_rand.cpp" />
<Unit filename="src/a_range.cpp" />
<Unit filename="src/a_regex.cpp" />
<Unit filename="src/a_shstr.cpp" />
<Unit filename="src/a_slice.cpp" />
<Unit filename="src/a_sort.cpp" />
<Unit filename="src/a_str.cpp" />
<Unit filename="src/a_strscan.cpp" />
<Unit filename="src/a_table.cpp" />
<Unit filename="src/a_time.cpp" />
<Unit filename="src/a_util.cpp" />
<Unit filename="src/a_winenv.cpp" />
<Unit filename="src/a_winerr.cpp" />
<Unit filename="src/a_xmlevents.cpp" />
<Unit filename="src/a_xmlparser.cpp" />
<Unit filename="src/a_xmltree.cpp" />
<Unit filename="src/test_main.cpp" />
<Extensions>
<code_completion />
<debugger />
Expand Down
2 changes: 1 addition & 1 deletion alib/inc/a_exec.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Executor {
Executor( const std::string & cmd = "" );
~Executor();

std::istream & Exec( const std::string & cmd = "" );
std::istream & Exec( const std::string & cmd = "", int ignorexit = 0 );

private:

Expand Down
1 change: 1 addition & 0 deletions alib/inc/a_linenv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// empty a_winenv.h to keep make happy
11 changes: 2 additions & 9 deletions alib/inc/a_win.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
//----------------------------------------------------------------------------
// a_win.h
//
// Include Windows headers and define ALIB_WIN if we are on windows.
// Any Windows specific code should include this.
// Removed conditional compilation stuff as this is managed by the linker.
//
// Copyright (C) 2010 Neil Butterworth
//----------------------------------------------------------------------------

#ifndef INC_ALIB_WIN_H
#define INC_ALIB_WIN_H

#ifdef WINNT
#undef ALIB_WINAPI
#define ALIB_WINAPI
#include <windows.h>
#else
#undef ALIB_WINAPI
#endif
#include <windows.h>

#endif
1 change: 1 addition & 0 deletions alib/inc/a_winenv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// empty a_winenv.h to keep make happy
23 changes: 2 additions & 21 deletions alib/readme.txt
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,2 @@
This is the utility library supporting the CSVfix program. Note that not
all functionality is used by CSVfix, and it could usefully be pruned.

The library is written by Neil Butterworth.

-----


Unfortunately there is only an [archived repo](https://code.google.com/archive/p/csvfix)
on Google Code, that does not compile on Linux or OSX. That repository points to a
successiv [repo on Bitbucket](http://neilb.bitbucket.org/csvfix) - but that one os
dead. Neil seems not to be on Github.

However, there is a newer tarball [version 1.6](https://sourceforge.net/projects/csvfix/)
on Sourceforge by [Pedro Albanese](https://sourceforge.net/u/pedroalbanese/profile/).

Unfortunately [Homebrew](https://brew.sh) does not find that. So the idea for this
repository here is to provide a current source release and to link
Homebrew to it.

Michael Wolber
This is the utility library supporting the CSVfix program. Note that not
all functionality is used by CSVfix, and it could usefully be pruned.
Loading