Skip to content

Commit

Permalink
updated documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
squell committed Dec 21, 2015
1 parent 6e593f6 commit f1bfb86
Show file tree
Hide file tree
Showing 5 changed files with 169 additions and 129 deletions.
4 changes: 3 additions & 1 deletion CHANGES
Expand Up @@ -7,8 +7,10 @@ Changelog for 'id3'.

2015-352 (W51):
fileexp.cpp: '?' will no langer match against / in --recursive mode;
-R was not working on UNC paths. optimized file access.
-R was not working on UNC paths in Windows. optimized file access.
setid3v2.cpp: convert text encoded using v2.4-only encodings
charconv.cpp: fix issues with iconv: const char** vs char** change
in FreeBSD; fix faulty behaviour wrt. unconvertible characters

2015-348 (W50):
main.cpp: %a variable substitution now will read from the first valid
Expand Down
4 changes: 2 additions & 2 deletions FreeBSD/Makefile
Expand Up @@ -27,7 +27,7 @@ BASH_PLIST_FILES= share/bash-completion/completions/id3

USES= iconv

CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
CFLAGS+= -I${ICONV_INCLUDE_PATH}
LDFLAGS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB}

.include <bsd.port.mk>
50 changes: 32 additions & 18 deletions INSTALL
Expand Up @@ -15,6 +15,7 @@ the contents of the source distribution:
makefile.nmk - makefile for microsoft c++

main.cpp - main program file (C++)
id3-images.c - auxiliary program to extract album art (C)
pattern.* - + automatic variables (C++)
dumptag.* - + save/reading tag info (C++)
sedit.* - string formatting (C++)
Expand Down Expand Up @@ -100,17 +101,29 @@ Successfully compiled with (non-exhaustive list):
- Borland/Embarcadero C++ 5.5/6.90
- Oracle/Sun C++ 5.13, using STLport4

This program is mostly written in portable ISO C90/C++03 so basically all
you need is a standards-compliant C/C++ compiler.
This program is written to be portable, assuming at least a C90 and C++03
compiler and a POSIX:2001 environment. Compilation shouldn't be hard.

Notes for building under Windows:

* When using MSVC, the file 'dirent.h' is not included with the compiler. You
can use the open source replacement by Toni Ronkko, obtainable at
https://github.com/tronkko/dirent/

* With MinGW, you need to add LDFLAGS="-static-libgcc -static-libstdc++" to
the mingw32-make commandline if you want to execute the resulting binary
on a machine without MinGW installed.

===
Makefiles

Pick the makefile you need and rename it to 'makefile' or use 'make -f':

'makefile' is meant for generic GNU/BSD systems. You will have to edit it
if you want to/need to use different settings. (You can also use this
file for building with mingw32-make)
'makefile' is meant for generic GNU/BSD systems. You can also use this
file for building with Cygwin or MinGW.

Please note that CFLAGS/CXXFLAGS/LDFLAGS set in your environment will
override the default (recommended) flags provided in this makefile.

'makefile.dj' is for DOS systems using DJGPP v2

Expand All @@ -121,26 +134,27 @@ Pick the makefile you need and rename it to 'makefile' or use 'make -f':
===
Standard makefile targets:

make id3 - fully enabled executable (default)
make all - both executables
make clean - removes all files produced by make
make - builds the program
make clean - removes all files produced by make

Generic GNU/BSD makefile targets & variables:

make install - installs the program
make install-strip - like install, but strips executable of debug info
make install-full - also installs the documentation in $(datadir)/doc
make uninstall - uninstall (does not remove documentation)
make help - lists all makefile targets and variables
make install - installs the program
make install-strip - like install, but strips executable of debug info
make install-full - also installs the documentation in $(datadir)/doc
make uninstall - uninstall (does not remove documentation)
make bash_completion - installs the bash completion support
make help - lists all makefile targets and variables

Because id3 does not have a configure script (yet), you can set
these variables only on the 'make' commandline:

prefix - the prefix directory (def. "/usr/local")
bindir - dir for binaries (def. "$(prefix)/bin")
mandir - dir for manpages (def. "$(prefix)/man")
datadir - dir for shared files (def. "$(prefix)/share")
binary - the binary to install (def. "id3")
prefix - the prefix directory (def. "/usr/local")
bindir - dir for binaries (def. "$(prefix)/bin")
mandir - dir for manpages (def. "$(prefix)/man")
datadir - dir for shared files (def. "$(prefix)/share")
binary - the binary to install (def. "id3")
DESTDIR - used for staged installs (def. "")

E.g: "make install prefix=$HOME" to install in $HOME/bin instead. See inside
'makefile' or try `make help' for more details (and more variables).
Expand Down

0 comments on commit f1bfb86

Please sign in to comment.