pmplib-commits

[Pmplib-commits] SF.net SVN: pmplib: [15] trunk

[<ny...@us...>]

Revision: 15
Author:   nyaochi
Date:     2006-05-05 21:57:28 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=15&view=rev

Log Message:
-----------
Supported iRiver U10 firmware 1.63.

Modified Paths:
--------------
    trunk/README
    trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c
Modified: trunk/README
===================================================================
--- trunk/README	2006-05-06 02:08:11 UTC (rev 14)
+++ trunk/README	2006-05-06 04:57:28 UTC (rev 15)
@@ -1,5 +1,5 @@
                                  PMPLib
-                               Version 0.6
+                               Version 0.9
                        http://pmplib.sourceforge.net/
                      Copyright (c) 2005-2006 by Nyaochi
 

Modified: trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c
===================================================================
--- trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c	2006-05-06 02:08:11 UTC (rev 14)
+++ trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c	2006-05-06 04:57:28 UTC (rev 15)
@@ -65,8 +65,8 @@
 		".plp",
 	},
 	{
-		"iriver_u10_ums_1.00-1.60", "U10 UMS", "UM",
-		"1.00", "1.60",
+		"iriver_u10_ums_1.00-1.63", "U10 UMS", "UM",
+		"1.00", "1.63",
 		"System\\U10.sys", "System\\U10.dat", "System\\U10.idx",
 		"Music\\", "Playlists\\",
 		".plp",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [16] trunk

[<ny...@us...>]

Revision: 16
Author:   nyaochi
Date:     2006-06-01 05:48:00 -0700 (Thu, 01 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=16&view=rev

Log Message:
-----------
A number of patches while I was away from the Internet connection.
- EasyPMP 0.10 alpha release.
- Rework on the interface for obtaining/setting player's environment.
- Fundamental work for skipping "the" in the artist field.

Modified Paths:
--------------
    trunk/README
    trunk/frontend/easypmp/common/database.c
    trunk/frontend/easypmp/common/easypmp.h
    trunk/frontend/easypmp/common/enumerate.c
    trunk/frontend/easypmp/common/playlist.c
    trunk/frontend/easypmp/cui/device.c
    trunk/frontend/easypmp/cui/main.c
    trunk/frontend/easypmp/cui/option.c
    trunk/frontend/easypmp/win32gui/easypmp_win32gui.rc
    trunk/include/gmi.h
    trunk/include/pmp.h
    trunk/include/ucs2char.h
    trunk/lib/gmi/gmi.c
    trunk/lib/pmp_iriverplus2/playlist.c
    trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c
    trunk/lib/pmp_irivnavi/pmp_irivnavi.c
    trunk/lib/pmp_portalplayer1/pmp_portalplayer1.c
    trunk/lib/ucs2/ucs2char.c
Modified: trunk/README
===================================================================
--- trunk/README	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/README	2006-06-01 12:48:00 UTC (rev 16)
@@ -1,5 +1,5 @@
                                  PMPLib
-                               Version 0.9
+                              Version 0.10
                        http://pmplib.sourceforge.net/
                      Copyright (c) 2005-2006 by Nyaochi
 

Modified: trunk/frontend/easypmp/common/database.c
===================================================================
--- trunk/frontend/easypmp/common/database.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/frontend/easypmp/common/database.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -186,7 +186,14 @@
 
 		// If we are not skipping this file, obtain the media information.
 		if (!is_skipping) {
-			if (gmi_get(record, filename, pmp->env.path_to_music, opt->media_info_source) == 0) {
+			if (gmi_get(
+				record,
+				filename,
+				pmp->env.path_to_music.path,
+				opt->media_info_source,
+				opt->strip_words,
+				opt->num_strip_words
+				) == 0) {
 				++num_obtained;
 			} else {
 			}

Modified: trunk/frontend/easypmp/common/easypmp.h
===================================================================
--- trunk/frontend/easypmp/common/easypmp.h	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/frontend/easypmp/common/easypmp.h	2006-06-01 12:48:00 UTC (rev 16)
@@ -89,6 +89,8 @@
 	char model[128];
 	char *system_encoding;
 	char *music_encoding;
+	ucs2char_t** strip_words;
+	int num_strip_words;
 } option_t;
 
 typedef struct {

Modified: trunk/frontend/easypmp/common/enumerate.c
===================================================================
--- trunk/frontend/easypmp/common/enumerate.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/frontend/easypmp/common/enumerate.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -101,7 +101,12 @@
 	ed.proc = proc;
 	ed.instance = instance;
 
-	return find_file(pmp->env.path_to_music, 1, found_music_file, &ed);
+	return find_file(
+		pmp->env.path_to_music.path,
+		pmp->env.path_to_music.flag & PMPPEF_RECURSIVE ? 1 : 0,
+		found_music_file,
+		&ed
+		);
 }
 
 static int found_playlist_file(void *instance, const ucs2char_t* found_path, const ucs2char_t* found_file)
@@ -164,10 +169,20 @@
 	ed.instance = instance;
 
 	if (opt->verb & MODE_PLAYLIST_PLAYLIST) {
-		ret = find_file(pmp->env.path_to_playlist, 0, found_playlist_file, &ed);
+		ret = find_file(
+			pmp->env.path_to_playlist.path,
+			pmp->env.path_to_playlist.flag & PMPPEF_RECURSIVE ? 1 : 0,
+			found_playlist_file,
+			&ed
+			);
 	}
 	if (opt->verb & MODE_PLAYLIST_MUSIC) {
-		ret = find_file(pmp->env.path_to_music, 1, found_playlist_file, &ed);
+		ret = find_file(
+			pmp->env.path_to_music.path,
+			pmp->env.path_to_music.flag & PMPPEF_RECURSIVE ? 1 : 0,
+			found_playlist_file,
+			&ed
+			);
 	}
 	return ret;
 }

Modified: trunk/frontend/easypmp/common/playlist.c
===================================================================
--- trunk/frontend/easypmp/common/playlist.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/frontend/easypmp/common/playlist.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -151,7 +151,7 @@
 			ucs2char_t dst[MAX_PATH];
 
 			// Generate a destination filename.
-			filepath_combinepath(dst, MAX_PATH, pmp->env.path_to_playlist, filepath_skippath(pl->name));
+			filepath_combinepath(dst, MAX_PATH, pmp->env.path_to_playlist.path, filepath_skippath(pl->name));
 			filepath_remove_extension(dst);
 			ucs2cat(dst, pmp->env.playlist_ext);
 
@@ -175,7 +175,7 @@
 			n = playlist_normalize(
 				pl,
 				filepath_skippath(pl->name),
-				pmp->env.path_to_root,
+				pmp->env.path_to_root.path,
 				mediafiles,
 				musics->num_elements
 				);

Modified: trunk/frontend/easypmp/cui/device.c
===================================================================
--- trunk/frontend/easypmp/cui/device.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/frontend/easypmp/cui/device.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -36,19 +36,26 @@
 
 #include "util.h"
 
-void device_show_information(pmp_t* pmp, FILE *fpe)
+static void device_show_pathflag(int flag, FILE* fp)
 {
-	fprintf(fpe, "Device identifier: %s\n", pmp->env.id);
-	fprintf(fpe, "  Product name: %s\n", pmp->env.name);
-	fprintf(fpe, "  Firmware mode: %s\n", pmp->env.mode);
-	fprintf(fpe, "  Firmware version: %s\n", pmp->env.version);
-	fprintf(fpe, "  Default language: %s\n", pmp->env.language);
-	fprints(fpe, "  Root directory: %s\n", pmp->env.path_to_root);
-	fprints(fpe, "  Music directory: %s\n", pmp->env.path_to_music);
-	fprints(fpe, "  Playlist directory: %s\n", pmp->env.path_to_playlist);
-	fprints(fpe, "  Playlist extension: %s\n", pmp->env.playlist_ext);
+	if (flag & PMPPEF_RECURSIVE) {
+		fprintf(fp, " sub_directory=yes");
+	}
 }
 
+void device_show_information(pmp_t* pmp, FILE *fp)
+{
+	fprintf(fp, "Device identifier: %s\n", pmp->env.id);
+	fprintf(fp, "  Product name: %s\n", pmp->env.name);
+	fprintf(fp, "  Firmware mode: %s\n", pmp->env.mode);
+	fprintf(fp, "  Firmware version: %s\n", pmp->env.version);
+	fprintf(fp, "  Default language: %s\n", pmp->env.language);
+	fprints(fp, "  Root directory: %s\n", pmp->env.path_to_root.path);
+	fprints(fp, "  Music directory: %s\n", pmp->env.path_to_music.path);
+	fprints(fp, "  Playlist directory: %s\n", pmp->env.path_to_playlist.path);
+	fprints(fp, "  Playlist extension: %s\n", pmp->env.playlist_ext);
+}
+
 static void enumerate_devid_callback(void *instance, const char *devid)
 {
 	pmphelp_t *pmphelp = (pmphelp_t*)instance;

Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/frontend/easypmp/cui/main.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -49,7 +49,7 @@
 #endif
 
 #define	APPLICATION_S	"EasyPMP [CUI]"
-#define	VERSION_S		"0.9 alpha"
+#define	VERSION_S		"0.10 alpha"
 #define	COPYRIGHT_S		"Copyright (c) 2005-2006 Nyaochi"
 
 int database_dump(pmp_t* pmp, FILE *fpo, int level);

Modified: trunk/frontend/easypmp/cui/option.c
===================================================================
--- trunk/frontend/easypmp/cui/option.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/frontend/easypmp/cui/option.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -91,13 +91,54 @@
 	fprintf(fp, "  -h, --help            Show this help message and exit\n");
 }
 
+static void set_strip_words(option_t* opt, const char *str)
+{
+	size_t i;
+	const char *p = 0, *q = 0;
+
+	for (i = 0;i < opt->num_strip_words;++i) {
+		ucs2free(opt->strip_words[i]);
+	}
+	ucs2free(opt->strip_words);
+
+	if (str && *str) {
+		opt->num_strip_words = 1;
+		for (p = str;*p;++p) {
+			if (*p == ',') {
+				opt->num_strip_words++;
+			}
+		}
+
+		p = q = str;
+		opt->strip_words = (ucs2char_t**)ucs2malloc(sizeof(ucs2char_t*) * opt->num_strip_words);
+		for (i = 0;i < opt->num_strip_words;++i) {
+			opt->strip_words[i] = 0;
+			for (;;) {
+				if (*q == ',' || !*q) {
+					size_t length = mbstoucs2(0, 0, p, q-p);
+					opt->strip_words[i] = ucs2malloc(sizeof(ucs2char_t*) * length + 1);
+					mbstoucs2(opt->strip_words[i], length, p, q-p);
+					opt->strip_words[i][length] = 0;
+					if (!*q) {
+						break;
+					} else {
+						p = q+1;
+					}
+				}
+				q++;
+			}
+		}
+	}
+}
+
 int option_parse(option_t* opt, int argc, char *argv[], FILE *fpe)
 {
 	int used_args = 0;
 
 	memset(opt, 0, sizeof(*opt));
 
-	opt->media_info_source |= GMIF_TAG;
+	opt->media_info_source |= (GMIF_TAG | GMIF_STRIP_ARTIST);
+	set_strip_words(opt, "the ");
 
 	/* Parse the command-line arguments. */
 	for (;;) {

Modified: trunk/frontend/easypmp/win32gui/easypmp_win32gui.rc
===================================================================
--- trunk/frontend/easypmp/win32gui/easypmp_win32gui.rc	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/frontend/easypmp/win32gui/easypmp_win32gui.rc	2006-06-01 12:48:00 UTC (rev 16)
@@ -213,8 +213,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,0,2
- PRODUCTVERSION 0,9,0,2
+ FILEVERSION 0,11,0,2
+ PRODUCTVERSION 0,11,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -230,12 +230,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "EasyPMP [Win32 GUI] application"
-            VALUE "FileVersion", "0, 9, 0, 2"
+            VALUE "FileVersion", "0, 11, 0, 2"
             VALUE "InternalName", "easypmp_win32gui"
             VALUE "LegalCopyright", "Copyright 2005-2006 Nyaochi"
             VALUE "OriginalFilename", "easypmp_win32gui.exe"
             VALUE "ProductName", "EasyPMP [Win32 GUI]"
-            VALUE "ProductVersion", "0, 9, 0, 2"
+            VALUE "ProductVersion", "0, 11, 0, 2"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/include/gmi.h
===================================================================
--- trunk/include/gmi.h	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/include/gmi.h	2006-06-01 12:48:00 UTC (rev 16)
@@ -40,6 +40,7 @@
 enum {
 	GMIF_NONE			= 0x00000000,
 	GMIF_TAG			= 0x00000001,
+	GMIF_STRIP_ARTIST	= 0x00000010,
 	GMIF_GENRE			= 0x00010000,
 	GMIF_ARTIST			= 0x00020000,
 	GMIF_ALBUM			= 0x00040000,
@@ -51,7 +52,14 @@
 #define	media_info_t	pmp_record_t
 #define	gmi_finish		pmp_record_finish
 
-GMIAPI int gmi_get(media_info_t* info, const ucs2char_t *filename, const ucs2char_t* path_to_music, int flag);
+GMIAPI int gmi_get(
+	media_info_t* info,
+	const ucs2char_t *filename,
+	const ucs2char_t* path_to_music,
+	int flag,
+	const ucs2char_t* strip_words[],
+	int num_strip_words
+	);
 
 #ifdef	__cplusplus
 }

Modified: trunk/include/pmp.h
===================================================================
--- trunk/include/pmp.h	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/include/pmp.h	2006-06-01 12:48:00 UTC (rev 16)
@@ -41,6 +41,9 @@
 struct tag_pmpdb_t;		typedef struct tag_pmpdb_t pmpdb_t;
 struct tag_pmppl_t;		typedef struct tag_pmppl_t pmppl_t;
 
+/**
+ * Error codes.
+ */
 enum {
 	PMP_SUCCESS = 0,
 	PMP_DEVICENOTFOUND,
@@ -66,17 +69,30 @@
 #define	PMPCODEC_VORBIS			PMPFOURCC('O','V','1',' ')
 #define	PMPCODEC_WAV			PMPFOURCC('W','A','V','E')
 
+enum {
+	PMPPEF_NONE =		0x0000,
+	PMPPEF_SUPPORT =	0x0001,
+	PMPPEF_CONSTANT	=	0x0002,
+	PMPPEF_RECURSIVE =	0x0004,
+};
+
 typedef struct {
+	int			flag;
+	ucs2char_t	path[MAX_PATH];
+} pmp_pathenv_t;
+
+typedef struct {
 	char	id[128];
 	char	name[128];
 	char	mode[128];
 	char	language[128];
 	char	version[128];
 
-	const ucs2char_t*	path_to_root;
-	const ucs2char_t*	path_to_music;
-	const ucs2char_t*	path_to_playlist;
-	const ucs2char_t*	playlist_ext;
+	pmp_pathenv_t	path_to_root;			/**< Path to the root directory */
+	pmp_pathenv_t	path_to_music;			/**< Path to the music files */
+	pmp_pathenv_t	path_to_playlist;		/**< Path to the playlist files */
+	pmp_pathenv_t	path_to_photo;			/**< Path to the photo files */
+	ucs2char_t		playlist_ext[MAX_PATH];
 } pmp_environment_t;
 
 /**

Modified: trunk/include/ucs2char.h
===================================================================
--- trunk/include/ucs2char.h	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/include/ucs2char.h	2006-06-01 12:48:00 UTC (rev 16)
@@ -88,6 +88,7 @@
 UCS2API int ucs2cmp(const ucs2char_t* x, const ucs2char_t* y);
 UCS2API int ucs2ncmp(const ucs2char_t* x, const ucs2char_t* y, size_t n);
 UCS2API int ucs2icmp(const ucs2char_t* x, const ucs2char_t* y);
+UCS2API int ucs2incmp(const ucs2char_t* x, const ucs2char_t* y, size_t n);
 
 UCS2API int ucs2memcmp(const ucs2char_t* buf1, const ucs2char_t* buf2, size_t count);
 UCS2API const ucs2char_t *ucs2memchr(const ucs2char_t* buf, ucs2char_t c, size_t count);

Modified: trunk/lib/gmi/gmi.c
===================================================================
--- trunk/lib/gmi/gmi.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/lib/gmi/gmi.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -177,8 +177,25 @@
 	return 0;
 }
 
-int gmi_get(media_info_t* info, const ucs2char_t *filename, const ucs2char_t* path_to_music, int flag)
+static void strip_head_letters(ucs2char_t* str, size_t offset)
 {
+	if (offset <= ucs2len(str)) {
+		size_t i, n = ucs2len(str) + 1 - offset;
+		for (i = 0;i < n;++i) {
+			str[i] = str[i+offset];
+		}
+	}
+}
+
+int gmi_get(
+	media_info_t* info,
+	const ucs2char_t *filename,
+	const ucs2char_t* path_to_music,
+	int flag,
+	const ucs2char_t* strip_words[],
+	int num_strip_words
+	)
+{
 	int ret = 1;
 	gmi_exports_t* exp = gmi_exports;
 
@@ -201,6 +218,18 @@
 	if (flag & GMIF_PARSEMASK) {
 		gmi_get_from_pathname(info, filename, path_to_music, flag);
 	}
+
+	/* Strip specific words in artist names. */
+	if ((flag & GMIF_STRIP_ARTIST) && strip_words) {
+		int i;
+		for (i = 0;i < num_strip_words;++i) {
+			if (ucs2incmp(info->artist, strip_words[i], ucs2len(strip_words[i])) == 0) {
+				strip_head_letters(info->artist, ucs2len(strip_words[i]));
+				break;
+			}
+		}
+	}
+
 	return ret;
 }
 

Modified: trunk/lib/pmp_iriverplus2/playlist.c
===================================================================
--- trunk/lib/pmp_iriverplus2/playlist.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/lib/pmp_iriverplus2/playlist.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -56,7 +56,7 @@
 
 		ip2db_init_record(&record);
 		ip2db_get_record(db, leafid, &record);
-		if (ucs2cmp(record.pathname, pathname) == 0) {
+		if (ucs2icmp(record.pathname, pathname) == 0 && ucs2icmp(record.filename, filepart) == 0) {
 			ip2db_free_record(&record);
 			return leafid;
 		}

Modified: trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c
===================================================================
--- trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/lib/pmp_iriverplus2/pmp_iriverplus2.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -65,8 +65,8 @@
 		".plp",
 	},
 	{
-		"iriver_u10_ums_1.00-1.63", "U10 UMS", "UM",
-		"1.00", "1.63",
+		"iriver_u10_ums_1.00-1.64", "U10 UMS", "UM",
+		"1.00", "1.64",
 		"System\\U10.sys", "System\\U10.dat", "System\\U10.idx",
 		"Music\\", "Playlists\\",
 		".plp",
@@ -294,6 +294,7 @@
 	pmp_internal_t* pmpi = NULL;
 	const ip2model_descriptor_t* md = NULL;
 	ip2_environment_t env;
+	pmp_environment_t* pmpenv = NULL;
 
 	*ptr_pmp = 0;
 
@@ -341,15 +342,19 @@
 	memcpy(&pmpi->env, &env, sizeof(env));
 
 	// Initialize the (exportable) env.
-	strcpy(pmp->env.id, md->id);
-	strcpy(pmp->env.name, md->name);
-	strcpy(pmp->env.mode, md->mode);
-	strcpy(pmp->env.language, pmpi->env.language);
-	strcpy(pmp->env.version, pmpi->env.version);
-	pmp->env.path_to_root = pmpi->env.path_to_root;
-	pmp->env.path_to_music = pmpi->env.path_to_music;
-	pmp->env.path_to_playlist = pmpi->env.path_to_playlist;
-	pmp->env.playlist_ext = pmpi->env.playlist_ext;
+	pmpenv = &pmp->env;
+	strcpy(pmpenv->id, md->id);
+	strcpy(pmpenv->name, md->name);
+	strcpy(pmpenv->mode, md->mode);
+	strcpy(pmpenv->language, pmpi->env.language);
+	strcpy(pmpenv->version, pmpi->env.version);
+	pmpenv->path_to_root.flag = PMPPEF_SUPPORT | PMPPEF_CONSTANT;
+	ucs2cpy(pmpenv->path_to_root.path, pmpi->env.path_to_root);
+	pmpenv->path_to_music.flag = PMPPEF_SUPPORT | PMPPEF_RECURSIVE;
+	ucs2cpy(pmpenv->path_to_music.path, pmpi->env.path_to_music);
+	pmpenv->path_to_playlist.flag = PMPPEF_SUPPORT;
+	ucs2cpy(pmpenv->path_to_playlist.path, pmpi->env.path_to_playlist);
+	ucs2cpy(pmpenv->playlist_ext, pmpi->env.playlist_ext);
 
 	// Prepare
 	pmp->add_ref(pmp);

Modified: trunk/lib/pmp_irivnavi/pmp_irivnavi.c
===================================================================
--- trunk/lib/pmp_irivnavi/pmp_irivnavi.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/lib/pmp_irivnavi/pmp_irivnavi.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -121,6 +121,7 @@
 	result_t ret = 0;
 	pmp_t* pmp = NULL;
 	pmp_internal_t* pmpi = NULL;
+	pmp_environment_t* pmpenv = NULL;
 
 	*ptr_pmp = 0;
 
@@ -200,10 +201,14 @@
 	pmp->env.version[0] = 0;	// Unknown version
 
 	// Set enviroments.
-	pmp->env.path_to_root = pmpi->env.path_to_root;
-	pmp->env.path_to_music = pmpi->env.path_to_music;
-	pmp->env.path_to_playlist = pmpi->env.path_to_playlist;
-	pmp->env.playlist_ext = pmpi->env.playlist_ext;
+	pmpenv = &pmp->env;
+	pmpenv->path_to_root.flag = PMPPEF_SUPPORT | PMPPEF_CONSTANT;
+	ucs2cpy(pmpenv->path_to_root.path, pmpi->env.path_to_root);
+	pmpenv->path_to_music.flag = PMPPEF_SUPPORT | PMPPEF_RECURSIVE;
+	ucs2cpy(pmpenv->path_to_music.path, pmpi->env.path_to_music);
+	pmpenv->path_to_playlist.flag = PMPPEF_SUPPORT | PMPPEF_RECURSIVE;
+	ucs2cpy(pmpenv->path_to_playlist.path, pmpi->env.path_to_playlist);
+	ucs2cpy(pmpenv->playlist_ext, pmpi->env.playlist_ext);
 
 	pmp->add_ref(pmp);
 	*ptr_pmp = pmp;
@@ -340,7 +345,7 @@
 	uint8_t *buffer = NULL;
 
 	// Open a database file in the root directory.
-	ucs2cpy(filename, pmpdb->pmp->env.path_to_root);
+	ucs2cpy(filename, pmpdb->pmp->env.path_to_root.path);
 	filepath_addslash(filename);
 	ucs2cat(filename, ucs2cs_irivnavi_idb);
 	fp = ucs2fopen(filename, "rb");
@@ -394,7 +399,7 @@
 	uint8_t *buffer = NULL;
 
 	// Open a database file in the root directory.
-	ucs2cpy(filename, pmpdb->pmp->env.path_to_root);
+	ucs2cpy(filename, pmpdb->pmp->env.path_to_root.path);
 	filepath_addslash(filename);
 	ucs2cat(filename, ucs2cs_irivnavi_idb);
 	filepath_removefile(filename);
@@ -437,7 +442,7 @@
 	result_t ret = 0;
 	uint32_t i, j, n = 0;
 	static const ucs2char_t ucs2cs_unknown[] = {'u','n','k','n','o','w','n',0};
-	const ucs2char_t* path_to_root = pmpdb->pmp->env.path_to_root;
+	const ucs2char_t* path_to_root = pmpdb->pmp->env.path_to_root.path;
 
 	// Clear the database.
 	irivnavi_finish(db);
@@ -488,7 +493,7 @@
 	irivnavi_t* db = (irivnavi_t*)pmpdb->instance;
 	result_t ret = 0;
 	uint32_t i, j, n = db->num_records;
-	const ucs2char_t* path_to_root = pmpdb->pmp->env.path_to_root;
+	const ucs2char_t* path_to_root = pmpdb->pmp->env.path_to_root.path;
 	static const ucs2char_t ucs2cs_mp3[] = {'.','m','p','3',0};
 	static const ucs2char_t ucs2cs_ogg[] = {'.','o','g','g',0};
 	static const ucs2char_t ucs2cs_wma[] = {'.','w','m','a',0};

Modified: trunk/lib/pmp_portalplayer1/pmp_portalplayer1.c
===================================================================
--- trunk/lib/pmp_portalplayer1/pmp_portalplayer1.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/lib/pmp_portalplayer1/pmp_portalplayer1.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -333,6 +333,7 @@
 	pmp_internal_t* pmpi = NULL;
 	const pp1model_descriptor_t* md = NULL;
 	pp1_environment_t env;
+	pmp_environment_t* pmpenv = NULL;
 
 	// Initialize.
 	*ptr_pmp = 0;
@@ -382,15 +383,19 @@
 	memcpy(&pmpi->env, &env, sizeof(env));
 	
 	// Initialize the (exportable) env.
-	strcpy(pmp->env.id, md->id);
-	strcpy(pmp->env.name, pmpi->env.model.name);
-	strcpy(pmp->env.mode, pmpi->env.model.mode);
-	strcpy(pmp->env.language, pmpi->env.model.language);
-	strcpy(pmp->env.version, pmpi->env.model.version);
-	pmp->env.path_to_root = pmpi->env.path_to_root;
-	pmp->env.path_to_music = pmpi->env.path_to_music;
-	pmp->env.path_to_playlist = pmpi->env.path_to_playlist;
-	pmp->env.playlist_ext = pmpi->env.playlist_ext;
+	pmpenv = &pmp->env;
+	strcpy(pmpenv->id, md->id);
+	strcpy(pmpenv->name, pmpi->env.model.name);
+	strcpy(pmpenv->mode, pmpi->env.model.mode);
+	strcpy(pmpenv->language, pmpi->env.model.language);
+	strcpy(pmpenv->version, pmpi->env.model.version);
+	pmpenv->path_to_root.flag = PMPPEF_SUPPORT | PMPPEF_CONSTANT;
+	ucs2cpy(pmpenv->path_to_root.path, pmpi->env.path_to_root);
+	pmpenv->path_to_music.flag = PMPPEF_SUPPORT | PMPPEF_RECURSIVE;
+	ucs2cpy(pmpenv->path_to_music.path, pmpi->env.path_to_music);
+	pmpenv->path_to_playlist.flag = PMPPEF_SUPPORT;
+	ucs2cpy(pmpenv->path_to_playlist.path, pmpi->env.path_to_playlist);
+	ucs2cpy(pmpenv->playlist_ext, pmpi->env.playlist_ext);
 
 	// Prepare
 	pmp->add_ref(pmp);

Modified: trunk/lib/ucs2/ucs2char.c
===================================================================
--- trunk/lib/ucs2/ucs2char.c	2006-05-06 04:57:28 UTC (rev 15)
+++ trunk/lib/ucs2/ucs2char.c	2006-06-01 12:48:00 UTC (rev 16)
@@ -189,6 +189,23 @@
 	return COMP(a, b);
 }
 
+int ucs2incmp(const ucs2char_t* x, const ucs2char_t* y, size_t n)
+{
+	size_t i;
+	ucs2char_t a = 0, b = 0;
+
+	for (i = 0;i < n-1;i++) {
+		a = ucs2upper(*x);
+		b = ucs2upper(*y);
+		if (!*x || !*y || a != b) {
+			break;
+		}
+		x++;
+		y++;
+	}
+	return COMP(a, b);
+}
+
 int ucs2memcmp(const ucs2char_t* buf1, const ucs2char_t* buf2, size_t count)
 {
 	size_t i;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [17] trunk

[<ny...@us...>]

Revision: 17
Author:   nyaochi
Date:     2006-06-01 06:37:11 -0700 (Thu, 01 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=17&view=rev

Log Message:
-----------
- Added missing Makefile.in
- Changed EOL character for autogen.sh

Modified Paths:
--------------
    trunk/autogen.sh

Added Paths:
-----------
    trunk/Makefile.in

Property Changed:
----------------
    trunk/autogen.sh
Added: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	                        (rev 0)
+++ trunk/Makefile.in	2006-06-01 13:37:11 UTC (rev 17)
@@ -0,0 +1,665 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# $Id$
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+LIBOBJDIR =
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+	config.guess config.sub depcomp install-sh ltmain.sh missing
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(docdir)"
+docDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(doc_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+ICONV_LIBS = @ICONV_LIBS@
+ID3TAG_LIBS = @ID3TAG_LIBS@
+INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+OGG_LIBS = @OGG_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+U = @U@
+VERSION = @VERSION@
+VORBISFILE_LIBS = @VORBISFILE_LIBS@
+VORBIS_LIBS = @VORBIS_LIBS@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = \
+	lib/ucs2 \
+	lib/filepath \
+	lib/gmi \
+	lib/playlist \
+	lib/pmp \
+	lib/pmp_irivnavi \
+	lib/pmp_portalplayer1 \
+	lib/pmp_iriverplus2 \
+	frontend/easypmp/cui
+
+docdir = $(prefix)/share/doc/@PACKAGE@
+doc_DATA = README NEWS INSTALL COPYING AUTHORS ChangeLog
+EXTRA_DIST = autogen.sh
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-docDATA: $(doc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+	@list='$(doc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	done
+
+uninstall-docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(doc_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-docDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-docDATA uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-libtool clean-recursive \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-recursive distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-docDATA install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-docDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2006-06-01 12:48:00 UTC (rev 16)
+++ trunk/autogen.sh	2006-06-01 13:37:11 UTC (rev 17)
@@ -1,38 +1,38 @@
-#!/bin/sh
-# $Id: autogen.sh,v 1.3 2005/08/06 21:41:54 nyaochi Exp $
-
-if [ "$1" = "--force" ];
-then
-    FORCE=--force
-    NOFORCE=
-    FORCE_MISSING=--force-missing
-else
-    FORCE=
-    NOFORCE=--no-force
-    FORCE_MISSING=
-fi
-
-libtoolize --copy $FORCE 2>&1 | sed '/^You should/d' || {
-    echo "libtoolize failed!"
-    exit 1
-}
-
-aclocal || {
-    echo "aclocal failed!"
-    exit 1
-}
-
-autoheader $FORCE || {
-    echo "autoheader failed!"
-    exit 1
-}
-
-automake -a -c $NOFORCE $FORCE_MISSING || {
-    echo "automake failed!"
-    exit 1
-}
-
-autoconf $FORCE || {
-    echo "autoconf failed!"
-    exit 1
-}
+#!/bin/sh
+# $Id: autogen.sh,v 1.3 2005/08/06 21:41:54 nyaochi Exp $
+
+if [ "$1" = "--force" ];
+then
+    FORCE=--force
+    NOFORCE=
+    FORCE_MISSING=--force-missing
+else
+    FORCE=
+    NOFORCE=--no-force
+    FORCE_MISSING=
+fi
+
+libtoolize --copy $FORCE 2>&1 | sed '/^You should/d' || {
+    echo "libtoolize failed!"
+    exit 1
+}
+
+aclocal || {
+    echo "aclocal failed!"
+    exit 1
+}
+
+autoheader $FORCE || {
+    echo "autoheader failed!"
+    exit 1
+}
+
+automake -a -c $NOFORCE $FORCE_MISSING || {
+    echo "automake failed!"
+    exit 1
+}
+
+autoconf $FORCE || {
+    echo "autoconf failed!"
+    exit 1
+}


Property changes on: trunk/autogen.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [19] trunk

[<ny...@us...>]

Revision: 19
Author:   nyaochi
Date:     2006-06-02 10:44:51 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=19&view=rev

Log Message:
-----------
More patch from Martin Ellis (and modified a little by me) for Linux support.
It's not tested yet.

Modified Paths:
--------------
    trunk/configure.in
    trunk/lib/pmp/Makefile.am
    trunk/lib/pmp/pmp_posix.c
    trunk/lib/pmp_iriverplus2/Makefile.am
    trunk/lib/pmp_irivnavi/Makefile.am
    trunk/lib/pmp_portalplayer1/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-02 00:08:40 UTC (rev 18)
+++ trunk/configure.in	2006-06-02 17:44:51 UTC (rev 19)
@@ -20,7 +20,7 @@
 AC_ISC_POSIX
 
 dnl Initialization for automake
-AM_INIT_AUTOMAKE(pmplib, 0.6)
+AM_INIT_AUTOMAKE(pmplib, 0.11)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 AM_C_PROTOTYPES
@@ -33,6 +33,7 @@
 
 dnl Initialozation for libtool
 AC_PROG_LIBTOOL
+AC_LIBTOOL_DLOPEN
 
 dnl Initialization for variables
 CFLAGS="${ac_save_CFLAGS}"
@@ -97,7 +98,17 @@
 	typedef A_UINT32_T uint32_t;
 #endif])
 
+dnl Checks for debugging mode
+AC_ARG_ENABLE(
+  debug,
+  [AC_HELP_STRING(--enable-debug, [Turn on debugging])]
+)
 
+if test "$enable_debug" = "yes"; then
+   CFLAGS="-DDEBUG -O -g ${CFLAGS}"
+fi
+
+
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_MEMCMP
@@ -112,16 +123,16 @@
 
 dnl Check for iconv library
 AC_ARG_WITH(
-  iconv-header,
-  [AC_HELP_STRING(--with-iconv-header=DIR, [iconv header directory])],
-  [CFLAGS="-I$withval ${CFLAGS}"]
+	iconv-header,
+	[AC_HELP_STRING(--with-iconv-header=DIR, [iconv header directory])],
+	[CFLAGS="-I$withval ${CFLAGS}"]
 )
 
 AC_ARG_WITH(
-  iconv-library,
-  [AC_HELP_STRING(--with-iconv-library=DIR, [iconv library directory])],
-  [LDFLAGS="-L$withval ${LDFLAGS}"; with_libiconv=native],
-  [with_libiconv=maybe]
+	iconv-library,
+	[AC_HELP_STRING(--with-iconv-library=DIR, [iconv library directory])],
+	[LDFLAGS="-L$withval ${LDFLAGS}"; with_libiconv=native],
+	[with_libiconv=maybe]
 )
 
 AC_CHECK_HEADER(iconv.h, , [AC_MSG_ERROR(iconv.h not found!)])
@@ -161,14 +172,14 @@
 esac
 
 if test "x$found_iconv" = "xno" ; then
-   AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
+	AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
 fi
 
 if test x$with_libiconv != xno ; then
-  case " $INTLLIBS " in
-  *[[\ \	]]-liconv[[\ \	]]*) ;;
-  *) ICONV_LIBS="-liconv" ;;
-  esac
+	case " $INTLLIBS " in
+	*[[\ \	]]-liconv[[\ \	]]*) ;;
+	*) ICONV_LIBS="-liconv" ;;
+	esac
 fi
 
 case $with_libiconv in
@@ -183,38 +194,46 @@
 
 dnl Checks for id3tag
 AC_ARG_WITH(
-  id3tag-header,
-  [AC_HELP_STRING(--with-id3tag-header=DIR, [id3tag header directory])],
-  [CFLAGS="-I$withval ${CFLAGS}"]
+	id3tag-header,
+	[AC_HELP_STRING(--with-id3tag-header=DIR, [id3tag header directory])],
+	[CFLAGS="-I$withval ${CFLAGS}"]
 )
 
 AC_ARG_WITH(
-  id3tag-library,
-  [AC_HELP_STRING(--with-id3tag-library=DIR, [id3tag library directory])],
-  [LDFLAGS="-L$withval ${LDFLAGS}"]
+	id3tag-library,
+	[AC_HELP_STRING(--with-id3tag-library=DIR, [id3tag library directory])],
+	[LDFLAGS="-L$withval ${LDFLAGS}"]
 )
 
 AC_CHECK_HEADER(
-  id3tag.h,
-  ,
-  [AC_MSG_ERROR(id3tag header not found!)]
+	id3tag.h,
+	,
+	[AC_MSG_ERROR(id3tag header not found!)]
 )
 AC_CHECK_LIB(
-  id3tag,
-  id3_file_fdopen,
-  [ID3TAG_LIBS="-lid3tag"],
-  AC_MSG_ERROR([id3tag library is not found!])
+	id3tag,
+	id3_file_fdopen,
+	[ID3TAG_LIBS="-lid3tag"],
+	AC_MSG_ERROR([id3tag library is not found!])
 )
-AC_CHECK_LIB(
-  id3tag,
-  id3_file_gettag,
-  [CFLAGS="-DHAVE_LIBID3TAG_GETTAG ${CFLAGS}"]
+
+dnl Checks for ogg
+AC_ARG_WITH(
+	ogg-header,
+	[AC_HELP_STRING(--with-ogg-header=DIR, [ogg header directory])],
+	[CFLAGS="-I$withval ${CFLAGS}"]
 )
 
+AC_ARG_WITH(
+	ogg-library,
+	[AC_HELP_STRING(--with-ogg-library=DIR, [ogg library directory])],
+	[LDFLAGS="-L$withval ${LDFLAGS}"]
+)
+
 AC_CHECK_HEADER(
-  ogg/ogg.h,
-  ,
-  [AC_MSG_ERROR(ogg header not found!)]
+	ogg/ogg.h,
+	,
+	[AC_MSG_ERROR(ogg header not found!)]
 )
 AC_CHECK_LIB(
   ogg,
@@ -223,6 +242,19 @@
   AC_MSG_ERROR([ogg library is not found!])
 )
 
+dnl Checks for vorbis
+AC_ARG_WITH(
+	vorbis-header,
+	[AC_HELP_STRING(--with-vorbis-header=DIR, [vorbis header directory])],
+	[CFLAGS="-I$withval ${CFLAGS}"]
+)
+
+AC_ARG_WITH(
+	vorbis-library,
+	[AC_HELP_STRING(--with-vorbis-library=DIR, [vorbis library directory])],
+	[LDFLAGS="-L$withval ${LDFLAGS}"]
+)
+
 AC_CHECK_HEADER(
   vorbis/codec.h,
   ,
@@ -246,16 +278,39 @@
   AC_MSG_ERROR([vorbisfile library is not found!])
 )
 
+dnl ------------------------------------------------------------------
+dnl Check for libsmjs (SpiderMonkey JavaScript engine)
+dnl ------------------------------------------------------------------
+found_smjs=no
 
-AC_ARG_ENABLE(
-  debug,
-  [AC_HELP_STRING(--enable-debug, [Turn on debugging])]
+AC_CHECK_HEADER(
+	[smjs/jsapi.h],
+	[AC_CHECK_LIB(smjs, JS_NewRuntime, [found_smjs="smjs"])]
 )
 
-if test "$enable_debug" = "yes"; then
-   CFLAGS="-DDEBUG -O -g ${CFLAGS}"
-fi
+AC_CHECK_HEADER(
+	[js/jsapi.h],
+	[AC_CHECK_LIB(js, JS_NewRuntime, [found_smjs="js"])]
+)
 
+case $found_smjs in
+  smjs)
+    AC_DEFINE(HAVE_LIBSMJS, 1, [Define if you have smjs or js library])
+    AC_DEFINE(USE_LIBJS_SMJS, 1, [Using smjs library for JavaScript engine])
+	AC_DEFINE(XP_UNIX, 1)
+	SMJS_LIBS="-lsmjs"
+    ;;
+  js)
+    AC_DEFINE(HAVE_LIBSMJS, 1, [Define if you have smjs or js library])
+    AC_DEFINE(USE_LIBJS_JS, 1, [Using js library for JavaScript engine])
+	AC_DEFINE(XP_UNIX, 1)
+	SMJS_LIBS="-ljs"
+    ;;
+  no)
+	AC_MSG_ERROR([js or smjs library is not found!])
+	;;
+esac
+
 dnl Export variables
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
@@ -266,8 +321,8 @@
 AC_SUBST(VORBIS_LIBS)
 AC_SUBST(VORBISFILE_LIBS)
 
-dnl Checks for library functions.
-# Should the in-tree copy of SMJS be used? Only on Windows.
+
+dnl Should the in-tree copy of SMJS be used? Only on Windows.
 case "$UNAME_SYSTEM" in
   CYGWIN*)
     AM_CONDITIONAL([WIN32], true)
@@ -280,6 +335,6 @@
   ;;
 esac
 
-
+dnl Output the configure results.
 AC_CONFIG_FILES(Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile)
 AC_OUTPUT

Modified: trunk/lib/pmp/Makefile.am
===================================================================
--- trunk/lib/pmp/Makefile.am	2006-06-02 00:08:40 UTC (rev 18)
+++ trunk/lib/pmp/Makefile.am	2006-06-02 17:44:51 UTC (rev 19)
@@ -8,12 +8,15 @@
 	pmp.c \
 	pmp_posix.c
 
+libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\""
+
 libpmp_la_LDFLAGS = \
+	-no-undefined
+
+libpmp_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
-	-no-undefined
+	-lltdl
 
-libpmp_la_LIBADD = -ldl
-
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-02 00:08:40 UTC (rev 18)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-02 17:44:51 UTC (rev 19)
@@ -59,7 +59,10 @@
 	pmphelp->num_plugins = 0;
 	pmphelp->plugins = NULL;
 
-	inst = dlopen("cygpmp_portalplayer1-0.dll", RTLD_LAZY);
+	lt_dlinit();
+	lt_dlsetsearchpath(PMP_MODULES_DIR);
+
+	inst = lt_dlopenext("libpmp_portalplayer1");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (void**)realloc(pmphelp->plugins, sizeof(void*) * pmphelp->num_plugins);
@@ -68,7 +71,7 @@
 		fprintf(stderr, "FAILED: cygpmp_portalplayer1-0.dll\n");
 	}
 
-	inst = dlopen("cygpmp_iriverplus2-0.dll", RTLD_LAZY);
+	inst = lt_dlopenext("libpmp_iriverplus2");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (void**)realloc(pmphelp->plugins, sizeof(void*) * pmphelp->num_plugins);
@@ -77,7 +80,7 @@
 		fprintf(stderr, "FAILED: cygpmp_iriverplus2-0.dll\n");
 	}
 
-	inst = dlopen("cygpmp_irivnavi-0.dll", RTLD_LAZY);
+	inst = lt_dlopenext("libpmp_irivnavi");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (void**)realloc(pmphelp->plugins, sizeof(void*) * pmphelp->num_plugins);
@@ -116,7 +119,7 @@
 	uint32_t i;
 
 	for (i = 0;i < pmphelpposix->num_plugins;++i) {
-		pmp_create_t func = (pmp_create_t)dlsym(pmphelpposix->plugins[i], "pmp_create");
+		pmp_create_t func = (pmp_create_t)lt_dlsym(pmphelpposix->plugins[i], "pmp_create");
 		if (func) {
 			ret = func(pmp, path_to_device, id);
 			if (ret != PMP_DEVICENOTFOUND) {

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-02 00:08:40 UTC (rev 18)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-02 17:44:51 UTC (rev 19)
@@ -1,5 +1,6 @@
 # $Id$
 
+pmpdir=$(libdir)/pmp
 lib_LTLIBRARIES = libpmp_iriverplus2.la
 
 libpmp_iriverplus2_la_SOURCES = \
@@ -23,11 +24,13 @@
 	pmp_iriverplus2.c
 
 libpmp_iriverplus2_la_LDFLAGS = \
+	-no-undefined  -module -avoid-versions \
+	-export-symbols ../pmp/pmp_plugin.sym
+
++iriverplus2_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
-	$(top_builddir)/lib/pmp/libpmp.la \
-	-no-undefined \
-	-module -export-symbols ../pmp/pmp_plugin.sym
+	$(top_builddir)/lib/pmp/libpmp.la
 
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/lib/pmp_irivnavi/Makefile.am	2006-06-02 00:08:40 UTC (rev 18)
+++ trunk/lib/pmp_irivnavi/Makefile.am	2006-06-02 17:44:51 UTC (rev 19)
@@ -13,11 +13,13 @@
 	pmp_irivnavi.c
 
 libpmp_irivnavi_la_LDFLAGS = \
+	-no-undefined -module -avoid-version \
+	-export-symbols ../pmp/pmp_plugin.sym
+
+libpmp_irivnavi_la_LDFLAGS = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
-	$(top_builddir)/lib/pmp/libpmp.la \
-	-no-undefined \
-	-module -export-symbols ../pmp/pmp_plugin.sym
+	$(top_builddir)/lib/pmp/libpmp.la
 
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-02 00:08:40 UTC (rev 18)
+++ trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-02 17:44:51 UTC (rev 19)
@@ -20,15 +20,20 @@
 	util.c \
 	util.h \
 	model_iriver_h10.c \
+	model_medion_mdjuke220.c \
+	model_medion_mdjuke440.c \
 	model_sirius_s50.c \
+	model_samsung.c \
 	pmp_portalplayer1.c
 
 libpmp_portalplayer1_la_LDFLAGS = \
+	-no-undefined -module -avoid-version \
+	-export-symbols ../pmp/pmp_plugin.sym
+
+libpmp_portalplayer1_la_LDFLAGS = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
-	$(top_builddir)/lib/pmp/libpmp.la \
-	-no-undefined \
-	-module -export-symbols ../pmp/pmp_plugin.sym
+	$(top_builddir)/lib/pmp/libpmp.la
 
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [27] trunk

[<ny...@us...>]

Revision: 27
Author:   nyaochi
Date:     2006-06-02 18:16:42 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=27&view=rev

Log Message:
-----------
Added iconv.m4, ogg.m4, vorbis.m4

Modified Paths:
--------------
    trunk/configure.in

Added Paths:
-----------
    trunk/m4/iconv.m4
    trunk/m4/ogg.m4
    trunk/m4/vorbis.m4
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-03 00:40:44 UTC (rev 26)
+++ trunk/configure.in	2006-06-03 01:16:42 UTC (rev 27)
@@ -130,76 +130,8 @@
 AC_CHECK_LIB(z, uncompress, , [AC_MSG_ERROR(libz not found!)])
 
 dnl Check for iconv library
-AC_ARG_WITH(
-	iconv-header,
-	[AC_HELP_STRING(--with-iconv-header=DIR, [iconv header directory])],
-	[CFLAGS="-I$withval ${CFLAGS}"]
-)
+AM_ICONV
 
-AC_ARG_WITH(
-	iconv-library,
-	[AC_HELP_STRING(--with-iconv-library=DIR, [iconv library directory])],
-	[LDFLAGS="-L$withval ${LDFLAGS}"; with_libiconv=native],
-	[with_libiconv=maybe]
-)
-
-AC_CHECK_HEADER(iconv.h, , [AC_MSG_ERROR(iconv.h not found!)])
-
-found_iconv=no
-case $with_libiconv in
-  maybe)
-    # Check in the C library first
-    AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
-    # Check if we have GNU libiconv
-    if test $found_iconv = "no"; then
-      AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
-    fi
-    # Check if we have a iconv in -liconv, possibly from vendor
-    if test $found_iconv = "no"; then
-      AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
-    fi
-    ;;
-  no)
-    AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
-    ;;
-  gnu|yes)
-    AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
-    ;;
-  native)
-    echo "native"
-    echo $LDFLAGS
-    # Check if we have GNU libiconv
-    if test $found_iconv = "no"; then
-      AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
-    fi
-    # Check if we have a iconv in -liconv, possibly from vendor
-    if test $found_iconv = "no"; then
-      AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
-    fi
-    ;;
-esac
-
-if test "x$found_iconv" = "xno" ; then
-	AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
-fi
-
-if test x$with_libiconv != xno ; then
-	case " $INTLLIBS " in
-	*[[\ \	]]-liconv[[\ \	]]*) ;;
-	*) ICONV_LIBS="-liconv" ;;
-	esac
-fi
-
-case $with_libiconv in
-  gnu)
-    AC_DEFINE(USE_LIBICONV_GNU, 1, [Using GNU libiconv])
-    ;;
-  native)
-    AC_DEFINE(USE_LIBICONV_NATIVE, 1, [Using a native implementation of iconv in a separate library])
-    ;;
-esac
-
-
 dnl Checks for id3tag
 AC_ARG_WITH(
 	id3tag-header,
@@ -226,66 +158,11 @@
 )
 
 dnl Checks for ogg
-AC_ARG_WITH(
-	ogg-header,
-	[AC_HELP_STRING(--with-ogg-header=DIR, [ogg header directory])],
-	[CFLAGS="-I$withval ${CFLAGS}"]
-)
+AM_PATH_OGG
 
-AC_ARG_WITH(
-	ogg-library,
-	[AC_HELP_STRING(--with-ogg-library=DIR, [ogg library directory])],
-	[LDFLAGS="-L$withval ${LDFLAGS}"]
-)
-
-AC_CHECK_HEADER(
-	ogg/ogg.h,
-	,
-	[AC_MSG_ERROR(ogg header not found!)]
-)
-AC_CHECK_LIB(
-  ogg,
-  ogg_stream_init,
-  [OGG_LIBS="-logg"],
-  AC_MSG_ERROR([ogg library is not found!])
-)
-
 dnl Checks for vorbis
-AC_ARG_WITH(
-	vorbis-header,
-	[AC_HELP_STRING(--with-vorbis-header=DIR, [vorbis header directory])],
-	[CFLAGS="-I$withval ${CFLAGS}"]
-)
+AM_PATH_VORBIS
 
-AC_ARG_WITH(
-	vorbis-library,
-	[AC_HELP_STRING(--with-vorbis-library=DIR, [vorbis library directory])],
-	[LDFLAGS="-L$withval ${LDFLAGS}"]
-)
-
-AC_CHECK_HEADER(
-  vorbis/codec.h,
-  ,
-  [AC_MSG_ERROR(vorbis header not found!)]
-)
-AC_CHECK_HEADER(
-  vorbis/vorbisfile.h,
-  ,
-  [AC_MSG_ERROR(vorbisfile header not found!)]
-)
-AC_CHECK_LIB(
-  vorbis,
-  vorbis_synthesis_init,
-  [VORBIS_LIBS="-lvorbis"],
-  AC_MSG_ERROR([vorbis library is not found!])
-)
-AC_CHECK_LIB(
-  vorbisfile,
-  ov_open,
-  [VORBISFILE_LIBS="-lvorbisfile"],
-  AC_MSG_ERROR([vorbisfile library is not found!])
-)
-
 dnl ------------------------------------------------------------------
 dnl Check for libsmjs (SpiderMonkey JavaScript engine)
 dnl ------------------------------------------------------------------

Added: trunk/m4/iconv.m4
===================================================================
--- trunk/m4/iconv.m4	                        (rev 0)
+++ trunk/m4/iconv.m4	2006-06-03 01:16:42 UTC (rev 27)
@@ -0,0 +1,69 @@
+#serial AM2
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  AC_SUBST(LIBICONV)
+])

Added: trunk/m4/ogg.m4
===================================================================
--- trunk/m4/ogg.m4	                        (rev 0)
+++ trunk/m4/ogg.m4	2006-06-03 01:16:42 UTC (rev 27)
@@ -0,0 +1,95 @@
+# Configure paths for libogg
+# Jack Moffitt <ja...@ic...> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
+dnl
+AC_DEFUN([AM_PATH_OGG],
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(ogg-prefix, AC_HELP_STRING([--with-ogg-prefix=DIR], [prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
+AC_ARG_ENABLE(oggtest, AC_HELP_STRING([--disable-oggtest], [do not try to compile and run a test Ogg program]), enable_oggtest=$enableval, enable_oggtest=yes)
+
+  if test x$ogg_prefix != x ; then
+    ogg_args="$ogg_args --prefix=$ogg_prefix"
+    OGG_CFLAGS="-I$ogg_prefix/include"
+    OGG_LIBS="-L$ogg_prefix/$XINE_LIBNAME"
+  fi
+
+  OGG_LIBS="$OGG_LIBS -logg"
+
+  AC_MSG_CHECKING(for Ogg)
+  no_ogg=""
+
+
+  if test "x$enable_oggtest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Ogg is sufficiently new.
+dnl
+      rm -f conf.oggtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ogg/ogg.h>
+
+int main ()
+{
+  system("touch conf.oggtest");
+  return 0;
+}
+
+],, no_ogg=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg.h>
+],       [ return 0; ],, no_ogg=yes))
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_ogg" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.oggtest ; then
+       :
+     else
+       echo "*** Could not run Ogg test program, checking why..."
+       CFLAGS="$CFLAGS $OGG_CFLAGS"
+       LIBS="$LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
+       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
+       echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
+       echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     OGG_CFLAGS=""
+     OGG_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(OGG_CFLAGS)
+  AC_SUBST(OGG_LIBS)
+  rm -f conf.oggtest
+])

Added: trunk/m4/vorbis.m4
===================================================================
--- trunk/m4/vorbis.m4	                        (rev 0)
+++ trunk/m4/vorbis.m4	2006-06-03 01:16:42 UTC (rev 27)
@@ -0,0 +1,100 @@
+# Configure paths for libvorbis
+# Jack Moffitt <ja...@ic...> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
+dnl
+AC_DEFUN([AM_PATH_VORBIS],
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(vorbis-prefix, AC_HELP_STRING([--with-vorbis-prefix=DIR], [prefix where libvorbis is installed (optional)]), vorbis_prefix="$withval", vorbis_prefix="")
+AC_ARG_ENABLE(vorbistest, AC_HELP_STRING([--disable-vorbistest], [do not try to compile and run a test Vorbis program]), enable_vorbistest=$enableval, enable_vorbistest=yes)
+
+  if test x$vorbis_prefix != x ; then
+    vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
+    VORBIS_CFLAGS="-I$vorbis_prefix/include"
+    VORBIS_LIBDIR="-L$vorbis_prefix/$XINE_LIBNAME"
+  fi
+
+  VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
+  VORBISFILE_LIBS="-lvorbisfile"
+  VORBISENC_LIBS="-lvorbisenc"
+
+  AC_MSG_CHECKING(for Vorbis)
+  no_vorbis=""
+
+
+  if test "x$enable_vorbistest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+    LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Vorbis is sufficiently new.
+dnl
+      rm -f conf.vorbistest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vorbis/codec.h>
+
+int main ()
+{
+  system("touch conf.vorbistest");
+  return 0;
+}
+
+],, no_vorbis=yes,
+         AC_TRY_LINK([
+#include <stdio.h>
+#include <vorbis/codec.h>
+],       [ return 0; ],, no_vorbis=yes))
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_vorbis" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.vorbistest ; then
+       :
+     else
+       echo "*** Could not run Vorbis test program, checking why..."
+       CFLAGS="$CFLAGS $VORBIS_CFLAGS"
+       LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <vorbis/codec.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
+       echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
+       echo "*** or that you have moved Vorbis since it was installed." ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     VORBIS_CFLAGS=""
+     VORBIS_LIBS=""
+     VORBISFILE_LIBS=""
+     VORBISENC_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(VORBIS_CFLAGS)
+  AC_SUBST(VORBIS_LIBS)
+  AC_SUBST(VORBISFILE_LIBS)
+  AC_SUBST(VORBISENC_LIBS)
+  rm -f conf.vorbistest
+])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [28] trunk

[<ny...@us...>]

Revision: 28
Author:   nyaochi
Date:     2006-06-03 10:37:08 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=28&view=rev

Log Message:
-----------
Reduced warnings. Added Makefile.am in m4 directory.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.in
    trunk/include/gmi.h
    trunk/include/pmp.h
    trunk/lib/pmp/Makefile.am
    trunk/lib/pmp/pmp_posix.c
    trunk/lib/pmp_iriverplus2/Makefile.am
    trunk/lib/pmp_iriverplus2/ip2db_idx.c
    trunk/lib/pmp_irivnavi/Makefile.am
    trunk/lib/pmp_irivnavi/pmp_irivnavi.c
    trunk/lib/pmp_portalplayer1/Makefile.am

Added Paths:
-----------
    trunk/m4/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -1,9 +1,7 @@
 # $Id$
 
-SUBDIRS = libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui
+SUBDIRS = m4 libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui
 
-INCLUDES = $(LTDLINCL)
-
 docdir = $(prefix)/share/doc/@PACKAGE@
 doc_DATA = README NEWS INSTALL COPYING AUTHORS ChangeLog
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/configure.in	2006-06-03 17:37:08 UTC (rev 28)
@@ -7,56 +7,70 @@
 dnl INCLUDES
 
 
+dnl ------------------------------------------------------------------
 dnl Initialization for autoconf
+dnl ------------------------------------------------------------------
 AC_PREREQ(2.53)
 AC_INIT
 AC_CONFIG_SRCDIR([frontend/easypmp/cui/main.c])
 
 
+dnl ------------------------------------------------------------------
 dnl Checks for system
+dnl ------------------------------------------------------------------
 AC_CANONICAL_HOST
 AC_AIX
 AC_MINIX
 AC_ISC_POSIX
 
+
+dnl ------------------------------------------------------------------
 dnl Initialization for automake
+dnl ------------------------------------------------------------------
 AM_INIT_AUTOMAKE(pmplib, 0.11)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 AM_C_PROTOTYPES
 
+
+dnl ------------------------------------------------------------------
 dnl Checks for program
+dnl ------------------------------------------------------------------
 AM_PROG_CC_STDC
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-dnl Initialozation for libtool
+
+dnl ------------------------------------------------------------------
+dnl Checks for libltdl
+dnl ------------------------------------------------------------------
 AC_LIBLTDL_CONVENIENCE
-dnl Substitute LTDLINCL and LIBLTDL in the Makefiles
 AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
-dnl Check for dlopen support
 AC_LIBTOOL_DLOPEN
-dnl Configure libtool
 AC_PROG_LIBTOOL
-dnl Configure libltdl
 AC_CONFIG_SUBDIRS(libltdl)
 
+
+dnl ------------------------------------------------------------------
 dnl Initialization for variables
+dnl ------------------------------------------------------------------
 CFLAGS="${ac_save_CFLAGS}"
 LDFLAGS="${ac_save_LDFLAGS}"
 INCLUDES="-I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)"
 
-dnl Additional options
 
-
+dnl ------------------------------------------------------------------
 dnl Checks for header files.
+dnl ------------------------------------------------------------------
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h unistd.h stdint.h getopt.h)
 
 
+dnl ------------------------------------------------------------------
 dnl Checks for typedefs, structures, and compiler characteristics.
+dnl ------------------------------------------------------------------
 AC_C_CONST
 AC_CHECK_SIZEOF
 AC_TYPE_SIZE_T
@@ -106,7 +120,10 @@
 	typedef A_UINT32_T uint32_t;
 #endif])
 
+
+dnl ------------------------------------------------------------------
 dnl Checks for debugging mode
+dnl ------------------------------------------------------------------
 AC_ARG_ENABLE(
   debug,
   [AC_HELP_STRING(--enable-debug, [Turn on debugging])]
@@ -117,7 +134,9 @@
 fi
 
 
+dnl ------------------------------------------------------------------
 dnl Checks for library functions.
+dnl ------------------------------------------------------------------
 AC_FUNC_ALLOCA
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
@@ -127,7 +146,7 @@
 AC_CHECK_LIB(m, rand)
 
 dnl Check for zlib library
-AC_CHECK_LIB(z, uncompress, , [AC_MSG_ERROR(libz not found!)])
+AC_CHECK_LIB(z, uncompress)
 
 dnl Check for iconv library
 AM_ICONV
@@ -163,12 +182,13 @@
 dnl Checks for vorbis
 AM_PATH_VORBIS
 
-dnl ------------------------------------------------------------------
 dnl Check for libsmjs (SpiderMonkey JavaScript engine)
-dnl ------------------------------------------------------------------
 AC_PATH_SPIDERMONKEY
 
+
+dnl ------------------------------------------------------------------
 dnl Export variables
+dnl ------------------------------------------------------------------
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(INCLUDES)
@@ -179,19 +199,8 @@
 AC_SUBST(VORBISFILE_LIBS)
 
 
-dnl Should the in-tree copy of SMJS be used? Only on Windows.
-case "$UNAME_SYSTEM" in
-  CYGWIN*)
-    AM_CONDITIONAL([WIN32], true)
-  ;;
-  MINGW*)
-    AM_CONDITIONAL([WIN32], true)
-  ;;
-  *)
-    AM_CONDITIONAL([WIN32], false)
-  ;;
-esac
-
+dnl ------------------------------------------------------------------
 dnl Output the configure results.
-AC_CONFIG_FILES(Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile)
+dnl ------------------------------------------------------------------
+AC_CONFIG_FILES(Makefile m4/Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile)
 AC_OUTPUT

Modified: trunk/include/gmi.h
===================================================================
--- trunk/include/gmi.h	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/include/gmi.h	2006-06-03 17:37:08 UTC (rev 28)
@@ -57,7 +57,7 @@
 	const ucs2char_t *filename,
 	const ucs2char_t* path_to_music,
 	int flag,
-	const ucs2char_t* strip_words[],
+	const ucs2char_t** strip_words,
 	int num_strip_words
 	);
 

Modified: trunk/include/pmp.h
===================================================================
--- trunk/include/pmp.h	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/include/pmp.h	2006-06-03 17:37:08 UTC (rev 28)
@@ -162,7 +162,7 @@
 	uint32_t (*add_ref)(pmppl_t* pmppl);
 	uint32_t (*release)(pmppl_t* pmppl);
 
-	result_t (*write)(pmppl_t* pmppl, const ucs2char_t* filename, const ucs2char_t* files[], uint32_t num_files);
+	result_t (*write)(pmppl_t* pmppl, const ucs2char_t* filename, const ucs2char_t** files, uint32_t num_files);
 };
 
 typedef result_t (*pmp_create_t)(pmp_t** pmp, const ucs2char_t* path_to_device, const char *devid);

Modified: trunk/lib/pmp/Makefile.am
===================================================================
--- trunk/lib/pmp/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -8,7 +8,7 @@
 	pmp.c \
 	pmp_posix.c
 
-libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\""
+libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\"" $(LTDLINCL)
 
 libpmp_la_LDFLAGS = \
 	-no-undefined

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-03 17:37:08 UTC (rev 28)
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif/*HAVE_CONFIG_H*/
 
-#include <dlfcn.h>
+#include <ltdl.h>
 
 #include <os.h>
 #include <ucs2char.h>
@@ -52,7 +52,7 @@
 
 result_t pmphelp_init(pmphelp_t** ptr_pmphelp)
 {
-	void *inst = NULL;
+	lt_dlhandle inst = 0;
 	pmphelp_posix_t* pmphelp = NULL;
 
 	pmphelp = (pmphelp_posix_t*)calloc(1, sizeof(pmphelp_posix_t));

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -1,6 +1,7 @@
 # $Id$
 
-pmpdir=$(libdir)/pmp
+libpmpdir=$(libdir)/pmp
+
 lib_LTLIBRARIES = libpmp_iriverplus2.la
 
 libpmp_iriverplus2_la_SOURCES = \

Modified: trunk/lib/pmp_iriverplus2/ip2db_idx.c
===================================================================
--- trunk/lib/pmp_iriverplus2/ip2db_idx.c	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_iriverplus2/ip2db_idx.c	2006-06-03 17:37:08 UTC (rev 28)
@@ -71,7 +71,12 @@
 			sortitems[i].records = records;
 			sortitems[i].index = i;
 		}
-		qsort(sortitems, num_records, sizeof(sortitem_t), idxexp->comp);
+		qsort(
+			sortitems,
+			num_records,
+			sizeof(sortitem_t),
+			idxexp->comp
+			);
 
 		/* Convert record_t elements into idxkey elements. */
 		for (i = 0;i < num_records;++i) {

Modified: trunk/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -1,5 +1,7 @@
 # $Id$
 
+libpmpdir=$(libdir)/pmp
+
 lib_LTLIBRARIES = libpmp_irivnavi.la
 
 libpmp_irivnavi_la_SOURCES = \

Modified: trunk/lib/pmp_irivnavi/pmp_irivnavi.c
===================================================================
--- trunk/lib/pmp_irivnavi/pmp_irivnavi.c	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_irivnavi/pmp_irivnavi.c	2006-06-03 17:37:08 UTC (rev 28)
@@ -262,7 +262,7 @@
 	*ptr_pmpdb = 0;
 
 	// Allocate a PMPDB instance.
-	pmpdb = calloc(1, sizeof(pmpdb_t));
+	pmpdb = (pmpdb_t*)calloc(1, sizeof(pmpdb_t));
 	if (!pmpdb) {
 		return PMPDBE_OUTOFMEMORY;
 	}
@@ -277,7 +277,7 @@
 	pmpdb->dump = pmpdb_dump;
 
 	// Allocate and initialize an internal object (irivnavi_t).
-	irivnavi = calloc(1, sizeof(irivnavi_t));
+	irivnavi = (irivnavi_t*)calloc(1, sizeof(irivnavi_t));
 	if (!irivnavi) {
 		free(pmpdb);
 		return PMPDBE_OUTOFMEMORY;
@@ -300,7 +300,7 @@
 
 	*ptr_pmppl = 0;
 
-	pmppl = calloc(1, sizeof(pmppl_t));
+	pmppl = (pmppl_t*)calloc(1, sizeof(pmppl_t));
 	if (!pmppl) {
 		return PMPDBE_OUTOFMEMORY;
 	}

Modified: trunk/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 01:16:42 UTC (rev 27)
+++ trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -1,5 +1,7 @@
 # $Id$
 
+libpmpdir=$(libdir)/pmp
+
 lib_LTLIBRARIES = libpmp_portalplayer1.la
 
 libpmp_portalplayer1_la_SOURCES = \

Added: trunk/m4/Makefile.am
===================================================================
--- trunk/m4/Makefile.am	                        (rev 0)
+++ trunk/m4/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
@@ -0,0 +1,7 @@
+# $Id: Makefile.am 20 2006-06-02 18:12:30Z nyaochi $
+
+EXTRA_DIST = \
+	iconv.m4 \
+	ogg.m4 \
+	vorbis.m4 \
+	smjs.m4


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [141] trunk

[<ny...@us...>]

Revision: 141
Author:   nyaochi
Date:     2006-07-28 22:18:48 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=141&view=rev

Log Message:
-----------
Added the source files for PMPlib web pages. We will scrap the current web pages powered by MODx
and migrate to simple HTML pages.

The source files consist of XML files describing the content, several image files, XSL files to generate
HTML and RSS files (xsltproc is necessary), and Makefile that generate the necessary files for web pages
by typing 'make'. 

Added Paths:
-----------
    trunk/webpage/
    trunk/webpage/1024px.css
    trunk/webpage/HACKING
    trunk/webpage/Makefile
    trunk/webpage/about.xml
    trunk/webpage/document.xml
    trunk/webpage/document_easypmp_tutorial.xml
    trunk/webpage/document_jspl.xml
    trunk/webpage/download.xml
    trunk/webpage/faq.xml
    trunk/webpage/images/
    trunk/webpage/images/background-800px.gif
    trunk/webpage/images/background.gif
    trunk/webpage/images/eac.png
    trunk/webpage/images/easypmp_win32gui_screenshot.png
    trunk/webpage/images/example.jpg
    trunk/webpage/images/fb2k-button.png
    trunk/webpage/images/fb2k_playlist.png
    trunk/webpage/images/music-folder.png
    trunk/webpage/index.xml
    trunk/webpage/links.xml
    trunk/webpage/news.xml
    trunk/webpage/newsrss.xsl
    trunk/webpage/pmplib.xsl
Added: trunk/webpage/1024px.css
===================================================================
--- trunk/webpage/1024px.css	                        (rev 0)
+++ trunk/webpage/1024px.css	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,216 @@
+/* 1024px - An open source xhtml/css website template by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer.
+
+Version: 1.2, April 20, 2006 */
+
+/******** General tags ********/
+body{
+	font:76% Verdana,Tahoma,Arial,sans-serif;
+	background:#ffffff url(images/background.gif) top center repeat-y;
+	color:#404040;
+	line-height:1.2em;
+	margin:0 auto;
+	padding:0;
+}
+
+a{
+	text-decoration:none;
+	color:#4088b8;
+}
+
+a img{
+	border:0;
+}
+
+p {
+	margin:0 0 10px 10px;
+}
+
+img {
+	margin: 0 0 10px 10px;
+}
+ul,ol,dl {
+	margin: 2px 0 16px 16px;
+}
+ul ul,ol ol {
+	margin:4px 0 4px 16px;
+}
+
+h1{
+font-size:4.2em;
+letter-spacing:-5px;
+margin:0 0 30px 25px;
+color:#4088b8;
+}
+
+h1 a{text-transform:none; color:#4088b8;}
+
+h2{
+font-size:1.4em;
+color:#4088b8;
+border-bottom:4px solid #dadada;
+padding:0 2px 2px 5px;
+margin:0 0 10px 0;
+letter-spacing:-1px;
+}
+
+h3{
+font-size:1.2em;
+font-weight:bold;
+color:#4088b8;
+border-bottom:1px solid #dadada;
+margin:10px 0 8px 0;
+padding:1px 2px 2px 3px;
+}
+
+blockquote{
+font-size:0.9em;
+border:1px solid #dadada;
+margin:20px 10px;
+padding:8px;
+}
+
+/******** Main wrap ********/
+#wrap{
+color:#404040;
+width:970px;
+margin:10px auto;
+padding:0;
+}
+
+#header{margin:0;}
+
+#toplinks{text-align:right; padding:5px 2px 2px 3px;}
+
+#slogan{
+font-size:1.5em;
+color:#808080;
+font-weight:bold;
+letter-spacing:-1px;
+margin:15px 0px 20px 35px;
+line-height:1.2em;
+}
+
+/******** sidebar ********/
+#sidebar{
+float:left;
+width:195px;
+margin:0 0 5px 0;
+padding:1px 0 0 0;
+}
+
+#sidebar ul{
+list-style:none;
+font-size:0.9em;
+margin:0;
+padding:0 0 15px 10px;
+}
+
+#sidebar li{
+list-style:none;
+margin:0 0 4px 0;
+padding:0;
+}
+
+#sidebar li a{
+font-size:1.2em;
+font-weight:bold;
+padding:2px;
+}
+
+#sidebar ul ul{
+margin:4px 0 3px 15px;
+line-height:1.2em;
+padding:0;
+}
+
+#sidebar ul ul li a{font-weight:normal;}
+#sidebar h2{margin:3px 0px 8px 0px;}
+
+/******** Content variations ********/
+#content{
+line-height:1.5em;
+width:750px;
+float:right;
+text-align:left;
+margin:0;
+padding:0;
+}
+
+#contentalt{
+line-height:1.5em;
+width:750px;
+float:left;
+text-align:left;
+padding:0;
+margin-right:20px;
+}
+
+#content h3, #contentalt h3{margin:10px 0 8px;}
+
+/******** Footer ********/
+#footer{
+clear:both;
+text-align:right;
+color:#808080;
+font-size:0.9em;
+border-top:4px solid #dadada;
+margin:0 auto;
+padding:8px 0;
+line-height:1.6em;
+}
+
+#footer p{margin:0; padding:0;}
+#footer a{color:#808080;}
+
+/******** Various classes ********/
+.box{
+color:#ffffff;
+font-size:0.9em;
+background-color:#4088b8;
+border:1px solid #c8c8c8;
+line-height:1.3em;
+padding:5px 5px 5px 8px;
+}
+
+.box a{color:#f0f0f0;}
+.left{float:left; margin:0 15px 4px 0;}
+.right{float:right; margin:0 0 4px 15px;}
+.textright{text-align:right;}
+.readmore{text-align:right; margin:-10px 10px 12px 0;}
+
+.center{text-align:center;}
+.blue{color:#4088b8;}
+.big{font-size:1.3em;}
+.small{font-size:0.8em;}
+.bold{font-weight:bold;}
+
+.clear{clear:both;}
+.hide{display:none;}
+.fade{color:#c8c8c8;}
+.gray{color:#808080;}
+
+.photo{
+border:1px solid #bababa;
+padding:2px;
+background-color:#ffffff;
+margin:6px 18px 2px 5px;
+}
+
+table {
+    margin: 8px;
+}
+
+code {
+    font: 1em 'Courier New', Courier, monospace;
+    color: #444;
+    white-space: pre; 
+    width: 640px;
+    height: auto;
+    overflow: auto;
+    display: block;
+    border: 1px solid #999;
+    border-width: 2px 0;
+    padding: 1em;
+    margin: 0 0 1em 48px;
+    background-color: #fafafa;
+}

Added: trunk/webpage/HACKING
===================================================================
--- trunk/webpage/HACKING	                        (rev 0)
+++ trunk/webpage/HACKING	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,15 @@
+1. How to write a Web content
+
+All Web pages are written in XML files. The specification was defined by me
+(Nyaochi), and no documentation is available for the specification. However,
+I think the specification is quite easy to guess from the existing XML files.
+
+
+2. How to convert XML files into HTML files
+
+Just type
+$ make
+This will generate HTML files by applying an XSLT stylesheet (pmplib.xsl)
+to updated XML file(s). You need xsltproc for XSLT processor.
+
+

Added: trunk/webpage/Makefile
===================================================================
--- trunk/webpage/Makefile	                        (rev 0)
+++ trunk/webpage/Makefile	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,26 @@
+
+TARGETS = \
+	index.html \
+	news.html \
+	download.html \
+	document.html \
+	document_easypmp_tutorial.html \
+	document_jspl.html \
+	faq.html \
+	about.html \
+	links.html \
+	index.rss \
+
+all:	$(TARGETS)
+
+.SUFFIXES:
+.SUFFIXES: .html .xml
+
+index.html:	index.xml news.xml
+
+.xml.html:	pmplib.xsl
+	xsltproc pmplib.xsl $< > $@
+
+index.rss:	newsrss.xsl news.xml
+	xsltproc --stringparam date "`date -R`" newsrss.xsl news.xml > $@
+

Added: trunk/webpage/about.xml
===================================================================
--- trunk/webpage/about.xml	                        (rev 0)
+++ trunk/webpage/about.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<title>About</title>
+<last-update>$Date: 2005/10/10 09:28:51 $</last-update>
+</head>
+
+<body>
+
+<section caption="What is PMPlib project?">
+<p>
+Portable Media Player library (PMPlib) is an open source project for the development of management software/library for various portable media players.
+The immediate objectives of this project:
+</p>
+<ul>
+<li>to understand the specifications of media database and playlists used in various portable media players</li>
+<li>to provide an alternative way to organize a player other than through bundled software or Windows Media Player</li>
+<li>to provide libraries for other applications to manage a player</li>
+<li>to make your player more accessible</li>
+</ul>
+</section>
+
+<section caption="Project members">
+<p>
+<dl>
+<dt>Nyaochi</dt>
+<dd>
+Project founder, admin, and core developer.
+He owns iriver H320, H10 UMS [5GB], H10Jr UMS [1GB], U10 UMS [512MB], and E10 [6GB].
+<br/>
+<img src="http://nyaochi.sakura.ne.jp/nyaochi-mail.png" />
+</dd>
+
+<dt>Martin Ellis</dt>
+<dd>
+Project admin and core developer.
+</dd>
+
+</dl>
+</p>
+</section>
+
+<section caption="Acknowledgement">
+<p>
+PMPlib uses the following libraries:
+</p>
+<ul>
+<li><a href="http://www.vorbis.com">libogg, libvorbis, libvorbisfile</a> licensed under BSD.</li>
+<li><a href="http://www.underbit.com/products/mad/">libid3tag</a> licensed under GPL.</li>
+<li><a href="http://www.gzip.org/zlib/">zlib</a> licensed under zlib licence.</li>
+<li><a href="http://www.mozilla.org/js/spidermonkey/">SpiderMonkey (JavaScript-C) Engine</a> licensed under MPL 1.1/GPL 2.0/LGPL 2.1</li>
+</ul>
+
+<p>
+PMPlib consults the following information (and source codes):
+</p>
+<ul>
+<li><a href="http://www.netrino.com/Connecting/2000-01/">Easier Said Than Done (CRC-32 calculation)</a> by Michael Barr.</li>
+</ul>
+
+</section>
+
+<section caption="Contact">
+<p>
+If you find any problems or have any suggestions, don't hesitate to contact us.
+</p>
+</section>
+
+</body>
+</page>

Added: trunk/webpage/document.xml
===================================================================
--- trunk/webpage/document.xml	                        (rev 0)
+++ trunk/webpage/document.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<title>Manual</title>
+<last-update>$Date: 2005/10/31 00:06:44 $</last-update>
+</head>
+
+<body>
+
+<section caption="PMPlib Document">
+
+<dl>
+
+<dt><a href="./document_easypmp_tutorial.html">EasyPMP Tutorial</a></dt>
+<dd>This article presents a life with EasyPMP. I strongly suggest one to read this before using EasyPMP.</dd>
+
+<dt><a href="./document_jspl.html">JavaScript playlist (JSPL)</a></dt>
+<dd>Specification of JavaScript playlist (JSPL)</dd>
+
+</dl>
+
+</section>
+
+</body>
+</page>

Added: trunk/webpage/document_easypmp_tutorial.xml
===================================================================
--- trunk/webpage/document_easypmp_tutorial.xml	                        (rev 0)
+++ trunk/webpage/document_easypmp_tutorial.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<title>Tutorial</title>
+<last-update>$Date: 2005/10/31 00:06:44 $</last-update>
+</head>
+
+<body>
+
+<section caption="EasyPMP Tutorial">
+<p>
+Can you imagine what life with EasyPMP is like?
+If not, check this tutorial before looking at the manuals.
+This tutorial presents a brief introduction of EasyPMP [Win32 GUI] and EasyPMP [CUI] versions.
+</p>
+
+<subsection caption="Prepare music files in your favorite way">
+<p>
+EasyPMP does not have built-in components to prepare music files, e.g., to extract music files from audio CD, to encode music files to the format supported by the player, to edit media information (e.g., track title, artist, album) in music files, etc.
+The absence of such components in EasyPMP is because we may prefer a number of useful and excellent software that has already been released for free.
+Here is a list of links to the software to manage music files:
+</p>
+
+<ul>
+<li><a href="http://www.exactaudiocopy.de/">Exact Audio Copy</a> (king-of-quality CD ripper)</li>
+<li><a href="http://cdexos.sourceforge.net/">CDex</a> (easy-to-use CD ripper of good quality)</li>
+<li><a href="http://lame.sourceforge.net/">LAME</a> (king-of-quality MP3 encoder)</li>
+<li><a href="http://www.vorbis.com/">Ogg Vorbis</a> (king-of-quality lossy audio codec)</li>
+<li><a href="http://www.foobar2000.org/">foobar2000</a> (multifunctional music player with CD ripper and encoders integrated)</li>
+
+<li><a href="http://www.quinnware.com/">Quintessential Player</a> (multifunctional music player with CD ripper and encoders integrated)</li>
+<li><a href="http://www.mp3tag.de/en/">MP3TAG</a> (tagging software)</li>
+<li><a href="http://users.otenet.gr/~jtcliper/tgf/">The GodFather</a> (tagging software)</li>
+</ul>
+
+<p>
+<a href="http://www.exactaudiocopy.de/"><img src="http://www.exactaudiocopy.de/eacbanner.png" height="31" width="88" /></a>
+<a href="http://www.foobar2000.org/"><img src="images/fb2k-button.png" height="31" width="88" /></a>
+<a href="http://www.quinnware.com/downloads.php"><img src="http://www.quinnware.com/img/bug3.gif" width="88" height="31" border="0" /></a>
+
+</p>
+<img src="images/eac.png" width="449" height="273" />
+</subsection>
+
+<subsection caption="Transfer the music files that you want to listen to">
+<p>
+Refer to <a href="">the list of supported players</a> for the location where we should place them.
+You can transfer the music files into your player by Explorer, or synchronization software (e.g. <a href="http://www.microsoft.com/windowsxp/using/digitalphotography/prophoto/synctoy.mspx">SyncToy for Windows XP</a>, <a href="http://samba.anu.edu.au/rsync/">rsync</a>, and <a href="http://www.cis.upenn.edu/~bcpierce/unison/">Unison</a>).
+</p>
+<img src="images/music-folder.png" width="386" height="285" />
+</subsection>
+
+<subsection caption="Transfer the playlist files that you want to use in your player">
+<p>
+Refer to <a href="">the list of supported players</a> for the location where we should place them.
+EasyPMP converts M3U/M3U8/PLS playlists into the native format recognized by your player.
+Just as music files, you can prepare playlist files in your favorite software such as <a href="http://www.winamp.com">WinAmp</a>, <a href="http://www.foobar2000.org/">foobar2000</a>, etc.
+EasyPMP can also generate dynamic playlists based on media information (e.g., all tracks by a specific artist, top 50 tracks played frequently, etc.) by describing JavaScript playlist (JSPL).
+</p>
+<img src="images/fb2k_playlist.png" width="385" height="277" />
+</subsection>
+
+<subsection caption="Run EasyPMP">
+<p>
+Run EasyPMP and choose a player location and determine processing modes (<i>update</i> or <i>rebuild</i>) for media database construction and playlist conversion.
+Press [OK] button in the previous dialog and wait for EasyPMP to complete the preparation.
+EasyPMP enumerates all music files located under music folders and constructs the media database (if necessary).
+It also converts M3U/M3U8/PLS/JSPL playlist files into respective playlist files (if necessary) that are recognized by your player.
+</p>
+<img src="images/easypmp_win32gui_screenshot.png" width="602" height="324" />
+<p>
+Note that EasyPMP <b>never interferes your style of preparing music files and transferring them into your player</b>.
+You don't have to stick with Windows Media Player 10 or cumbersome bundled software any more.
+</p>
+</subsection>
+</section>
+
+</body>
+</page>

Added: trunk/webpage/document_jspl.xml
===================================================================
--- trunk/webpage/document_jspl.xml	                        (rev 0)
+++ trunk/webpage/document_jspl.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<title>JavaScript playlist (JSPL)</title>
+<last-update>$Date: 2006/04/30 16:32:02 $</last-update>
+</head>
+
+<body>
+
+<section caption="JavaScript playlist (JSPL)">
+
+<subsection caption="Introduction">
+<p>
+A <i>playlist</i> is a sequence (ordered list) of media tracks (i.e., songs and movies) to specify one's favorite tracks and their order.
+In general, a playlist stores a sequence of file names (either in relative or absolute paths).
+For example, an M3U playlist is mere a text file in which each line describes a reference (i.e., a file name in relative or absolute path) to a media track.
+Therefore, playlists are <i>static</i> in the sense that the user must revise them to change the track list or sequence.
+Although it is useful to represent one's best tracks in his or her collection, some might want to organize playlist automatically with some rules, for example,
+</p>
+<ul>
+<li>All tracks in the player arranged in a random order;</li>
+<li>All tracks performed by the Beatles;</li>
+<li>All tracks with genre "Rock";</li>
+<li>Top 100 tracks played frequently in the player.</li>
+</ul>
+<p>
+We call such playlists described by the rules as <i>dynamic playlists</i>.
+Dynamic playlists can be achieved by introducing a user interface (e.g., GUI form) to specify artist name, genre name, playback count, etc.
+However, such approach lacks the versatility: a user might not be satisfied with a predefined GUI form if he or she wants a playlist with more complicated rules.
+For this reason, we introduce a scripting language in which a user can access to the media information of all tracks, choose necessary tracks based on the media information, and arrange the tracks in an arbitrary order.
+EasyPMP employs <i>JavaScript</i> as the scripting language for describing dynamic playlists.
+</p>
+<p>
+JavaScript is best known as the scripting language for dynamic web contents and has a great number of users.
+Some might presume that JavaScript is just for web contents, but it is also used as a scripting language embedded in other applications, e.g., Virtual Reality Modeling Language (VRML), Scalable Vector Graphics (SVG), etc.
+Moreover, JavaScript has a powerful language specification for describing dynamic playlist, featuring:
+</p>
+<ul>
+<li>Object Oriented Programing (OOP)</li>
+<li>Useful built-in objects such as Array, Math, Object, String, etc.</li>
+<li>Unicode support in String object.</li>
+<li>Regular Expression (RegExp) object.</li>
+</ul>
+</subsection>
+
+<subsection caption="The function to be implemented: main">
+<p>
+Any JavaScript playlist must implement function <i>main</i>.
+This function chooses tracks to be included in the target playlist(s) from media information of all tracks in a portable player.
+For generating a single playlist, the function should return a JavaScript Array instance that represents a sequence (ordered list) of tracks.
+For generating multiple playlists, the function should return a JavaScript Object instance storing associations from playlist names to their corresponding track sequences.
+The application such as EasyPMP sets the necessary arguments (e.g., media information) to the function, receives the JavaScript value from the <i>main</i> function, and generates the corresponding playlist(s).
+</p>
+<p>
+The following describes a skeleton code implementing the minimum components for a valid JSPL, not including any tracks to the corresponding plylist.
+</p>
+<code><![CDATA[/**
+ * A skeleton code for JSPL.
+ *  @param  media   The array of media information of all tracks.
+ *  @param  src     The full-path name of this JSPL file.
+ *  @return         A JavaScript array (for singple playlist);
+ *                  a JavaScript object (for multiple playlists).
+ */
+function main(media, src)
+{
+}
+]]></code>
+<p>
+Content of a playlist is determined by the array returned by the function <i>main</i>.
+For example, if an implementation collects tracks by a specific artist, the corresponding playlist will have the tracks by the artist.
+The primary task of the <i>main</i> function is to choose a set of preferred tracks by implementing a conditional expression.
+The following code extracts tracks performed by the Beatles.
+</p>
+<code><![CDATA[/* JSPL with all tracks by Beatles. */
+
+function main(media, src)
+{
+    // Create a JavaScript array representing a playlist.
+    var pl = new Array();
+
+    for (var i = 0;i < media.length;++i) {
+        var track = media[i];
+
+        // Add the current track if the artist name is "Beatles".
+        if (track.artist == "Beatles") {
+            pl.push(track);
+        }
+    }
+
+    // Return the playlist.
+    return pl;
+}
+]]></code>
+<p>
+In addition, the playback order of a playlist is determined by the order of tracks stored in the JavaScript Array object.
+For example, if a returned array contains all tracks in a portable player in a random order, the corresponding playlist will be a random playlist with all tracks.
+The function is responsible for sorting tracks in a preferred order, e.g., numerical order of track numbers, alphabetical order of track titles, etc.
+The following code extracts all tracks in a player and arranges them in an alphabetical order of track titles.
+The sorting implementation can be simplified by using Playlist class "playlist.js" (described later).
+</p>
+<code><![CDATA[/* JSPL with all tracks in an alphabetical order. */
+
+function comp_title(x, y)
+{
+    return ((x.title)>(y.title))-((x.title)<(y.title));
+}
+
+function main(media, src)
+{
+    // Create a JavaScript array representing a playlist.
+    var pl = new Array();
+
+    // Add all tracks to the playlist.
+    for (var i = 0;i < media.length;++i) {
+        pl.push(media[i]);
+    }
+
+    // Sort the playlist in an alphabetical order of track titles.
+    pl.sort(comp_title);
+
+    // Return the playlist.
+    return pl;
+}
+]]></code>
+<p>
+A JavaScript playlist can generate multiple playlists, e.g., playlists each of which represents tracks by an artist.
+The <i>main</i> function must return a JavaScript object storing mappings from playlist names and their playlist contents.
+According to the JavaScript language specification, any JavaScript object incorporates an <i>associative array</i> that associates attribute names and their values.
+In JavaScript playlist, an attribute name represents a playlist name, and its value corresponds to a JavaScript array storing the track list.
+The following JSPL collects the tracks performed by the same artist into a playlist and generates such playlists for all artists.
+</p>
+<code><![CDATA[/* JSPL for organizing multiple playlists by artist names. */
+
+function main(media, src)
+{
+    // Container storing multiple playlists.
+    var pls = new Object();
+
+    for (var i = 0;i < media.length;++i) {
+        var track = media[i];
+
+        // Access to the playlist named as the artist name.
+	var pl = pls[track.artist];
+
+        // Create a new playlist if such playlist does not exist.
+	if (pl == undefined) {
+	    pl = pls[track.artist] = new Array();
+        }
+
+        // Add this track to the playlist.
+	pl.push(track);
+    }
+
+    // Return the container of multiple playlists.
+    return pls;
+}
+]]></code>
+</subsection>
+
+<subsection caption="Arguments to main function">
+<p>
+Function <i>main</i> receives two arguments, <i>media</i> and <i>src</i>.
+The first argument <i>media</i> is an array of JavaScript objects each of which represents media information of a track in a portable player.
+Each element in the array has a set of attributes that represents the media information.
+A JavaScript playlist makes use of the attributes to extract preferred tracks and to arrange them in a preferred order.
+The following is the list of the attributes in each element.
+</p>
+
+<table border="1">
+<tr><th>Field name</th><th>Type</th><th>Description</th><th>Example</th></tr>
+<tr>
+<td>id</td>
+<td>Integer</td>
+<td>Unique identifier</td>
+<td>1</td>
+</tr>
+
+<tr>
+<td>filename</td>
+<td>String</td>
+<td>Full-path name of the media file</td>
+<td>D:\Music\Beatles\YellowSubmarine\02.mp3</td>
+</tr>
+<tr>
+<td>title</td>
+<td>String</td>
+<td>Title name</td>
+
+<td>Hey Bulldog</td>
+</tr>
+<tr>
+<td>artist</td>
+<td>String</td>
+<td>Artist name</td>
+<td>Beatles</td>
+</tr>
+<tr>
+<td>composer</td>
+<td>String</td>
+
+<td>Composer of this track typically used for classical music.</td>
+<td>John Lennon &amp; Paul McCartney</td>
+</tr>
+<tr>
+<td>album</td>
+<td>String</td>
+<td>Album name</td>
+<td>Yellow Submarine</td>
+</tr>
+<tr>
+
+<td>genre</td>
+<td>String</td>
+<td>Genre name</td>
+<td>Rock</td>
+</tr>
+<tr>
+<td>codec</td>
+<td>Integer</td>
+<td>Codec identifier</td>
+<td>Codec.OggVorbis</td>
+
+</tr>
+<tr>
+<td>track_number</td>
+<td>Integer</td>
+<td>Track number</td>
+<td>2</td>
+</tr>
+<tr>
+<td>sample_rate</td>
+<td>Integer</td>
+<td>Sample rate in Hz</td>
+
+<td>44100</td>
+</tr>
+<tr>
+<td>bitrate</td>
+<td>Integer</td>
+<td>Bitrate in bps</td>
+<td>128000</td>
+</tr>
+<tr>
+<td>duration</td>
+<td>Integer</td>
+
+<td>Track length in seconds</td>
+<td>193</td>
+</tr>
+<tr>
+<td>rating</td>
+<td>Integer</td>
+<td>Rating value</td>
+<td>5</td>
+</tr>
+<tr>
+<td>play_count</td>
+
+<td>Integer</td>
+<td>The number of playback times</td>
+<td>3</td>
+</tr>
+<tr>
+<td>update_timestamp</td>
+<td>Integer</td>
+<td>Timestamp of the last modified</td>
+<td>193</td>
+</tr>
+
+<tr>
+<td>import_timestamp</td>
+<td>Integer</td>
+<td>Timestamp when this track was added to the database</td>
+<td>193</td>
+</tr>
+<tr>
+<td>playback_timestamp</td>
+<td>Integer</td>
+<td>Timestamp when this track was played in the player</td>
+
+<td>193</td>
+</tr>
+</table>
+
+<p>
+The second argument <i>src</i> presents the full-path name of the current JavaScript playlist.
+</p>
+</subsection>
+
+<subsection caption="JSPL extension to ECMAScript">
+<p>
+For debugging purpose, JSPL defines a global function <i>print</i> to display values.
+The function takes multiple arguments and outputs the argument values.
+The following code outputs artist, album, and title names of all tracks.
+</p>
+<code><![CDATA[/* JSPL displaying track artists, albums, and titles. */
+
+function main(media, src)
+{
+    for (var i = 0;i < media.length;++i) {
+        var track = media[i];
+        print(track.artist, track.album, track.title);
+    }
+}
+]]></code>
+<p>
+JSPL defines a global function <i>include</i> to evaluate an external JavaScript file.
+This function is useful to modularize reusable components.
+The following code import "playlist.js" located in JSPL include path (typically "jspl" directory under EasyPMP executable).
+</p>
+<code><![CDATA[include("playlist.js");
+]]></code>
+</subsection>
+
+<subsection caption="Codec object (defined as a global object)">
+<p>
+<i>Codec</i> object defines codec identifiers used by <i>codec</i> field in media information.
+Following member variables are defined:
+</p>
+
+<dl>
+<dt>MP3</dt><dd>MPEG Audio Layer III</dd>
+<dt>OggVorbis</dt><dd>Ogg Vorbis</dd>
+<dt>WAV</dt><dd>Microsoft WAVE</dd>
+<dt>WMA</dt><dd>Windows Media Audio</dd>
+</dl>
+</subsection>
+
+<subsection caption="Playlist object (playlist.js)">
+<p>
+Playlist class is a specialization of JavaScript Array for the management of a playlist.
+In addition to the member function in Array, Playlist class has two member functions, <i>order</i> and <i>shuffle</i>.
+</p>
+
+<subsubsection caption="order function">
+<p>
+Member function <i>order</i> is useful to arrange tracks in a playlist.
+Although JavaScript Array class has member function <i>sort</i>, it is boring to implement a comparison function to arrange tracks in a preferred order.
+The function arranges tracks by the field(s) specified by the argument(s).
+Each argument represents the field name to predicate the order of two tracks.
+Receiving "title" as an argument, for example, the function arranges tracks in a alphabetical (descending) order of title names.
+If the function receives an argument beginning with character '-', tracks are arranged in an ascending order.
+</p>
+<p>
+If the values of two tracks are identical by a comparison with the field specified by the first argument, the function tries the next field specified by the second argument (if any).
+This process will be repeated while the values of two tracks are identical.
+If two tracks are identical even after comparing with all fields, the order is left undefined.
+</p>
+<p>
+The following snippet arranges tracks in an alphabetical order of artist names.
+If artist names of two tracks are identical, the order is determined by the alphabetical order of album names.
+If artist and album names of two tracks are the same, the order is determined by the numerical order of track numbers.
+</p>
+<code><![CDATA[include("playlist.js");
+
+pl = new Playlist();
+...
+/* Arrange tracks by artists, albums, and track numbers. */
+pl.order("artist", "album", "track_number");
+]]></code>
+<p>
+The following code arranges tracks in a <i>descending</i> order of play counts, i.e., in a popularity order.
+</p>
+<code><![CDATA[include("playlist.js");
+
+pl = new Playlist();
+...
+/* Arrange tracks in a descending order of play counts. */
+pl.order("-play_count");
+]]></code>
+</subsubsection>
+
+<subsubsection caption="shuffle function">
+<p>
+Member function <i>shuffle</i> randomizes the order of tracks in a playlist.
+The function is useful to generate a shuffle playlist.
+</p>
+<code><![CDATA[include("playlist.js");
+
+pl = new Playlist();
+...
+/* Arrange tracks in a random order. */
+pl.shuffle();
+]]></code>
+</subsubsection>
+</subsection>
+
+<subsection caption="Examples">
+
+<subsubsection caption="Artist.jspl">
+<code><![CDATA[/*
+ *      Artist playlist
+ *
+ * This JSPL extracts tracks performed by the artist whose name is
+ * is specified by either variable 'artist_name' or filename of this JSPL.
+ *
+ */
+
+// Change this to specify the artist name
+var artist_name = "";
+
+include("playlist.js");
+
+function main(media, source)
+{
+	// Check artist_name.
+	if (!artist_name) {
+		// Retrieve an artist name from the filename.
+		var begin = 0, end = source.length;
+		for (var i = 0;i < source.length;++i) {
+			if (source[i] == '\' || source[i] == '/')
+				begin = i;
+			if (source[i] == '.')
+				end = i;
+		}
+		artist_name = source.slice(begin, end);
+	}
+
+	// Convert the artist name to lower case.
+	artist_name = artist_name.toLowerCase();
+
+	var pl = new Playlist();
+	for (var i = 0;i < media.length;++i)
+		if (media[i].artist.toLowerCase() == artist_name)
+			pl.push(media[i]);
+	pl.order("album", "track_number");
+
+	return pl;
+}
+]]></code>
+</subsubsection>
+
+<subsubsection caption="Artists.jspl">
+<code><![CDATA[/*
+ *      Artists playlist
+ *
+ * This JSPL generates multiple playlists each of which collects tracks
+ * performed by an artist.
+ *
+ */
+
+include("playlist.js");
+
+function main(media, playlist)
+{
+	var pls = new Object();
+
+	for (var i = 0;i < media.length;++i) {
+		var artist = media[i].artist.toLowerCase();
+		var pl = pls[artist];
+		if (pl == undefined)
+			pl = pls[artist] = new Playlist();
+		pl.push(media[i]);
+	}
+
+	for (var name in pls) {
+		var pl = pls[name];
+		pl.order("album", "track_number");
+	}
+
+	return pls;
+}
+]]></code>
+</subsubsection>
+</subsection>
+
+<subsection caption="Reference">
+<ul>
+<li>
+<a href="http://developer.mozilla.org/en/docs/JavaScript">JavaScript - MDC</a>: Documentation of the JavaScript language used by Gecko-based browsers (e.g., FireFox) and also by EasyPMP (libplaylist).
+
+</li>
+<li>
+<a href="http://www.mozilla.org/js/spidermonkey/">SpiderMonkey</a>: The JavaScript engine used by EasyPMP (libplaylist). It is Gecko's JavaScript engine written in C. It is used in various Mozilla products, and is available under MPL/GPL/LGPL tri-license.
+</li>
+</ul>
+</subsection>
+</section>
+</body>
+</page>

Added: trunk/webpage/download.xml
===================================================================
--- trunk/webpage/download.xml	                        (rev 0)
+++ trunk/webpage/download.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<title>Download</title>
+<last-update>$Date: 2006/04/30 16:32:00 $</last-update>
+</head>
+
+<body>
+
+<section caption="Download">
+<p>
+Currently, EasyPMP is the only application we develop and release.
+</p>
+
+<subsection caption="EasyPMP [Win32]">
+<p>
+Download the <a href="http://sourceforge.net/project/showfiles.php?group_id=157298&amp;package_id=175772">EasyPMP binary for Windows 2000/XP</a> at sourceforge.net.
+</p>
+</subsection>
+
+<subsection caption="EasyPMP [POSIX]">
+<p>
+Download the <a href="http://sourceforge.net/project/showfiles.php?group_id=157298&amp;package_id=175772">source code of pmplib</a> at sourceforge.net.
+</p>
+</subsection>
+</section>
+
+<section caption="Accessing the source code through SVN">
+<p>
+The source code is available at the <a href="http://sourceforge.net/svn/?group_id=157298">subversion repository</a>.
+You can also <a href="http://svn.sourceforge.net/pmplib">browse the source code</a> through the web browsers.
+</p>
+</section>
+
+</body>
+</page>

Added: trunk/webpage/faq.xml
===================================================================
--- trunk/webpage/faq.xml	                        (rev 0)
+++ trunk/webpage/faq.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<title>Frequently Asked Questions (FAQ)</title>
+<last-update>$Date: 2006/01/23 20:52:40 $</last-update>
+</head>
+
+<body>
+<makeindex caption="Table of Contents: PMPlib FAQ" />
+
+<section caption="EasyH10 Frequently Asked Questions (FAQ)">
+<subsection caption="item #1">
+</subsection>
+</section>
+
+</body>
+</page>

Added: trunk/webpage/images/background-800px.gif
===================================================================
(Binary files differ)


Property changes on: trunk/webpage/images/background-800px.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/webpage/images/background.gif
===================================================================
(Binary files differ)


Property changes on: trunk/webpage/images/background.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/webpage/images/eac.png
===================================================================
(Binary files differ)


Property changes on: trunk/webpage/images/eac.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/webpage/images/easypmp_win32gui_screenshot.png
===================================================================
(Binary files differ)


Property changes on: trunk/webpage/images/easypmp_win32gui_screenshot.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/webpage/images/example.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/webpage/images/example.jpg
___________________________________________________________________
Name: svn:mime-type
   + image/jpeg

Added: trunk/webpage/images/fb2k-button.png
===================================================================
(Binary files differ)


Property changes on: trunk/webpage/images/fb2k-button.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/webpage/images/fb2k_playlist.png
===================================================================
(Binary files differ)


Property changes on: trunk/webpage/images/fb2k_playlist.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/webpage/images/music-folder.png
===================================================================
(Binary files differ)


Property changes on: trunk/webpage/images/music-folder.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/webpage/index.xml
===================================================================
--- trunk/webpage/index.xml	                        (rev 0)
+++ trunk/webpage/index.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<include-rss />
+<last-update>$Date: 2006/01/17 14:07:30 $</last-update>
+</head>
+
+<body>
+
+<section caption="Welcome to PMPlib project!">
+<p>
+Portable Media Player library (PMPlib) is an open source project for the development of management software/library for various portable media players. PMPlib project currently supports the following hardware:
+</p>
+<ul>
+<li>iRiver H100 series</li>
+<li>iRiver H300 series</li>
+<li>iRiver H10 UMS</li>
+<li>iRiver H10 MTP (with emergency connect mode)</li>
+<li>iRiver H10Jr. UMS</li>
+<li>iRiver U10 UMS</li>
+<li>MEDION MDJuke220</li>
+<li>MEDION MDJuke440</li>
+<li>Samsung YH-820</li>
+<li>Samsung YH-920</li>
+<li>Samsung YH-925</li>
+</ul>
+</section>
+
+<section caption="News">
+<include-news />
+</section>
+
+</body>
+</page>

Added: trunk/webpage/links.xml
===================================================================
--- trunk/webpage/links.xml	                        (rev 0)
+++ trunk/webpage/links.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<title>Links</title>
+<last-update>$Date: 2005/10/31 00:06:44 $</last-update>
+</head>
+
+<body>
+
+<section caption="Links">
+<p>
+If you know other useful sites or create a web site related to PMPlib, please let us know.
+</p>
+</section>
+
+</body>
+</page>

Added: trunk/webpage/news.xml
===================================================================
--- trunk/webpage/news.xml	                        (rev 0)
+++ trunk/webpage/news.xml	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml-stylesheet href="./pmplib.xsl" type="application/xml"?>
+
+<page>
+<head>
+<include-rss />
+<title>News</title>
+<last-update>$Date: 2006/04/30 16:32:02 $</last-update>
+</head>
+
+<body>
+
+<news>
+
+<ni caption="EasyPMP version 0.11 released" date="2006-06-06">
+<p>
+We are pleased to annouce that PMPlib 0.11 was released with the source-code distribution for POSIX environments.
+</p>
+<ul>
+<li><b>The memorable release of PMPlib source code for POSIX environments.</b> Martin Ellis, who joined the PMPlib project as a developer, achieved this miracle with his brilliant skill of programming. We confirmed that the current source code worked fine on Debian GNU/Linux 3.1. Note that libid3tag, libz, libogg, libvorbis, SpiderMonkey are necessary for building EasyPMP. Please report the workability or problems on your environments because we are not sure about the portability with other Linux distributions and Mac OS.</li>
+
+<li>A serious bug-fix in playlist conversion for iRiver U10 and H10Jr. Playlist conversion did not work correctly if multiple files whose names begin with the same eight letters exist.</li>
+<li>Implemented a function to strip preceding words such as 'the' in artist names.</li>
+<li>Supported U10 UMS firmware 1.65.</li>
+</ul>
+</ni>
+
+<ni caption="EasyPMP version 0.10 released" date="2006-05-25">
+<p>
+<b>Welcome to EasyPMP, iRiver U10 users worldwide!</b>
+</p>
+<p>
+Following <a href="http://www.iriver.com/mtp/">iRiver's great decision</a> of releasing the UMS firmware for U10 shipped with the MTP firmware, we are pleased to release EasyPMP version 0.10 alpha to support the latest firmware, U10 UMS firmware version 1.64.
+The difference between the previous version to the current is only that EasyPMP now recognizes U10 UMS 1.64 automatically.
+Even though this is a minor change to the source code, we release a new version to celebrate the new firmware!
+</p>
+</ni>
+
+<ni caption="EasyPMP version 0.9 released" date="2006-05-05">
+<p>
+EasyPMP version 0.9 was released.
+</p>
+<ul>
+<li>Revised the specification of JavaScript playlist for better flexibility. The new specification is totally incompatible with the old one. Please refer to the <a href="jspl.html">JSPL documentation</a>.</li>
+<li>Load the media database automatically when enabling JSPL.</li>
+<li>Supported Samsung YH-820 player.</li>
+<li>Supported Samsung YH-925 player (to be confirmed; maybe...)</li>
+<li>Launched the official web site.</li>
+</ul>
+</ni>
+
+<ni caption="EasyPMP version 0.8 released" date="2006-02-13">
+<p>
+EasyPMP version 0.8 was released.
+</p>
+<ul>
+<li>Supported JavaScript Playlist (JSPL). Put artists.jspl into your playlist folder to experience how powerful it is.</li>
+<li>Supported configurable sources of media information. EasyPMP can now make use of folder structure and file name for obtaining media information.</li>
+<li>Bug-fix in playlist generation for PortalPlayer based players.</li>
+</ul>
+</ni>
+
+<ni caption="EasyPMP version 0.7 released" date="2006-02-11">
+<p>
+EasyPMP version 0.7 was released.
+</p>
+<ul>
+<li>Supported Medion MDJuke 440, MDJuke220.</li>
+</ul>
+</ni>
+
+<ni caption="EasyPMP version 0.6 released" date="2006-01-24">
+<p>
+EasyPMP version 0.6 was released.
+</p>
+<ul>
+<li>Bug fix in database construction for H10Jr/U10</li>
+</ul>
+</ni>
+
+<ni caption="EasyPMP version 0.5 released" date="2006-01-09">
+<p>
+EasyPMP version 0.5 was the initial release of Win32 GUI version.
+</p>
+</ni>
+
+<ni caption="EasyPMP version 0.4 released" date="2006-01-03">
+<p>
+EasyPMP version 0.4 was released.
+</p>
+<ul>
+<li>Implemented the incremental update of media database and playlists.</li>
+<li>Revised command-line switches.</li>
+<li>Changed the license of some DLLs to LGPL.</li>
+</ul>
+</ni>
+
+<ni caption="EasyPMP version 0.3 released" date="2006-01-01">
+<p>
+EasyPMP version 0.3 was released.
+</p>
+<ul>
+<li>Changed the application name to EasyPMP.</li>
+<li>Supported iRiver H10 players.</li>
+<li>Implemented playlist conversion.</li>
+<li>Fixed a bug in the database construction for iRiver H10Jr/U10.</li>
+<li>Exported the internal libraries as dynamic link libraries (DLLs) for the future use.</li>
+</ul>
+</ni>
+
+<ni caption="DMPSync version 0.2 released" date="2005-12-24">
+<p>
+DMPSync version 0.2 was released.
+</p>
+<ul>
+<li>Supported iRiver H100/H300 database (iRivNavi.iDB)</li>
+</ul>
+</ni>
+
+<ni caption="DMPSync version 0.1 released" date="2005-12-23">
+<p>
+This is the initial attemp to construct a media database for iriver H10Jr/U10 players.
+Only Win32 CUI version was released.
+No playlist conversion at this moment.
+</p>
+</ni>
+
+</news>
+
+</body>
+</page>

Added: trunk/webpage/newsrss.xsl
===================================================================
--- trunk/webpage/newsrss.xsl	                        (rev 0)
+++ trunk/webpage/newsrss.xsl	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0"	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:output
+	method="xml"
+	encoding="ISO-8859-1"
+	/>
+
+<xsl:template match="/">
+	<rss version="2.0">
+		<channel>
+			<title>PMPlib News</title>
+			<link>http://pmplib.sourceforge.net/</link>
+			<description>Portable Media Player library (PMPlib) is an open source project for the development of management software and library for various portable media players.</description>
+			<copyright><xsl:call-template name="copyright" /></copyright>
+			<lastBuildDate><xsl:value-of select="$date" /></lastBuildDate>
+			<generator>PMPlib News RSS generator</generator>
+			<xsl:apply-templates select="/page/body/news" />
+		</channel>
+	</rss>
+</xsl:template>
+
+
+<xsl:template match="news">
+<xsl:apply-templates select="ni[1]" />
+<xsl:apply-templates select="ni[2]" />
+<xsl:apply-templates select="ni[3]" />
+<xsl:apply-templates select="ni[4]" />
+<xsl:apply-templates select="ni[5]" />
+<xsl:apply-templates select="ni[6]" />
+<xsl:apply-templates select="ni[7]" />
+<xsl:apply-templates select="ni[8]" />
+<xsl:apply-templates select="ni[9]" />
+<xsl:apply-templates select="ni[10]" />
+</xsl:template>
+
+<xsl:template match="ni">
+<item>
+<title><xsl:value-of select="@caption" /> (<xsl:value-of select="@date" />)</title>
+<description><xsl:apply-templates /></description>
+<author>Nyaochi</author>
+<link>http://easyh10.sourceforge.net/news.html#<xsl:value-of select="generate-id()" /></link>
+<guid isPermaLink="true">http://easyh10.sourceforge.net/news.html#<xsl:value-of select="generate-id()" /></guid>
+</item>
+</xsl:template>
+
+
+
+
+
+<xsl:template match="a">
+<a>
+	<xsl:attribute name="href"><xsl:value-of select="@href" /></xsl:attribute>
+	<xsl:apply-templates />
+</a>
+</xsl:template>
+
+<xsl:template match="p"><p><xsl:apply-templates /></p></xsl:template>
+<xsl:template match="br"><br/></xsl:template>
+<xsl:template match="i"><i><xsl:apply-templates /></i></xsl:template>
+<xsl:template match="b"><b><xsl:apply-templates /></b></xsl:template><xsl:template match="u"><u><xsl:apply-templates /></u></xsl:template>
+<xsl:template match="table">
+<div align="center">
+<xsl:if test="@caption"><br/><b><xsl:value-of select="@caption" /></b></xsl:if>
+<table border="1">
+<xsl:if test="@border"><xsl:attribute name="border"><xsl:value-of select="@border" /></xsl:attribute></xsl:if>
+<xsl:apply-templates />
+</table>
+</div>
+</xsl:template>
+<xsl:template match="tr"><tr><xsl:apply-templates /></tr></xsl:template>
+<xsl:template match="td"><td><xsl:if test="@colspan"><xsl:attribute name="colspan"><xsl:value-of select="@colspan" /></xsl:attribute></xsl:if><xsl:apply-templates /></td></xsl:template>
+<xsl:template match="th"><th><xsl:if test="@width"><xsl:attribute name="width"><xsl:value-of select="@width" /></xsl:attribute></xsl:if><xsl:apply-templates /></th></xsl:template>
+
+<xsl:template match="shell"><pre class="shell"><xsl:apply-templates /></pre></xsl:template><xsl:template match="br"><br/></xsl:template>
+<xsl:template match="pre"><pre><xsl:apply-templates /></pre></xsl:template>
+<xsl:template match="source"><pre class="source"><xsl:apply-templates /></pre></xsl:template>
+<xsl:template match="ul"><ul><xsl:apply-templates /></ul></xsl:template>
+<xsl:template match="ol"><ol><xsl:apply-templates /></ol></xsl:template>
+<xsl:template match="li"><li><xsl:apply-templates /></li></xsl:template>
+<xsl:template match="dl"><dl><xsl:apply-templates /></dl></xsl:template>
+<xsl:template match="dt"><dt><xsl:apply-templates /></dt></xsl:template>
+<xsl:template match="dd"><dd><xsl:apply-templates /></dd></xsl:template>
+
+<xsl:template match="fig"><p align="center">
+<xsl:choose>
+<xsl:when test="@detail-src">
+<a><xsl:attribute name="href">fig/<xsl:value-of select="@detail-src" /></xsl:attribute><img><xsl:attribute name="src">http://www.iriver.co.jp/images/supporter/670_52/<xsl:value-of select="@src" /></xsl:attribute></img></a>
+</xsl:when>
+<xsl:otherwise>
+<img><xsl:attribute name="src">fig/<xsl:value-of select="@src" /></xsl:attribute></img>
+</xsl:otherwise>
+</xsl:choose>
+<xsl:if test="@caption"><br/><b><xsl:value-of select="@caption" /></b></xsl:if></p></xsl:template>
+
+<xsl:template match="img">
+<img><xsl:attribute name="src"><xsl:value-of select="@src" /></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="@alt" /></xsl:attribute></img>
+</xsl:template>
+
+<xsl:template match="jpg"><div align="center">
+<a><xsl:attribute name="href">fig/<xsl:value-of select="@src" />.jpg</xsl:attribute><img><xsl:attribute name="src">fig/<xsl:value-of select="@src" />-s.jpg</xsl:attribute></img></a>
+<xsl:if test="@caption"><br/><b><xsl:value-of select="@caption" /></b></xsl:if>
+</div>
+</xsl:template>
+
+<xsl:template match="gif"><div align="center">
+<a><xsl:attribute name="href">fig/<xsl:value-of select="@src" />.gif</xsl:attribute><img><xsl:attribute name="src">fig/<xsl:value-of select="@src" />-s.gif</xsl:attribute></img></a>
+<xsl:if test="@caption"><br/><b><xsl:value-of select="@caption" /></b></xsl:if>
+</div>
+</xsl:template>
+
+<xsl:template match="section-table">
+<table border="1">
+<xsl:apply-templates mode="section-table"/>
+</table>
+</xsl:template>
+
+<xsl:template match="ts" mode="section-table">
+<xsl:apply-templates mode="section-table">
+	<xsl:with-param name="section_caption" select="@caption" />
+	<xsl:with-param name="num_rowspan" select="count(tr)" />
+</xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="tr" mode="section-table">
+	<xsl:param name="section_caption"></xsl:param>
+	<xsl:param name="num_rowspan">1</xsl:param>
+	<tr>
+	<xsl:choose>
+		<xsl:when test="@superior='1'"><xsl:attribute name="bgcolor">#DDDDFF</xsl:attribute></xsl:when>
+		<xsl:when test="@superior='2'"><xsl:attribute name="bgcolor">#FFDDDD</xsl:attribute></xsl:when>
+		<xsl:otherwise></xsl:otherwise>
+	</xsl:choose>
+	<xsl:if test="position() = 2">
+		<td align="middle" bgcolor="#DDDDDD">
+			<xsl:attribute name="rowspan"><xsl:value-of select="$num_rowspan" /></xsl:attribute>
+			<xsl:value-of select="$section_caption" />
+		</td>
+	</xsl:if>
+	<td><xsl:value-of select="@caption" /></td>
+	<xsl:apply-templates />
+	</tr>
+</xsl:template>
+
+<xsl:template match="thr" mode="section-table">
+<tr bgcolor="#AAAAAA"><xsl:apply-templates /></tr>
+</xsl:template>
+
+
+<!-- Named Template -->
+<xsl:template name="copyright">Copyright (c) 2005-2006 PMPlib project.</xsl:template>
+
+</xsl:stylesheet>

Added: trunk/webpage/pmplib.xsl
===================================================================
--- trunk/webpage/pmplib.xsl	                        (rev 0)
+++ trunk/webpage/pmplib.xsl	2006-07-29 05:18:48 UTC (rev 141)
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0"	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:output
+	method="xml"
+	encoding="ISO-8859-1"
+	doctype-public="-//W3C//DTD XHTML 1.1//EN"
+	doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
+	/>
+
+<xsl:template match="/">
+	<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+		<head>
+			<meta http-equiv="Content-Type" content="text/html; charaset=ISO-8859-1" />
+			<meta name="keywords" content="PMPlib,EasyPMP,Portable Media Player,database,playlist" />
+			<meta name="description" content="Portable Media Player library (PMPlib) is an open source project for the development of management software/library for various portable media players." />
+			<meta name="author" content="http://pmplib.sourceforge.net/" />
+			<meta name="copyright" content="Copyright (c) 2005-2006 by PMPlib project" />
+
+			<link rel="stylesheet" href="./1024px.css" type="text/css" title="1024px style" media="screen,projection"/>
+			<xsl:if test="/page/head/include-rss"><link rel="alternate" type="application/rss+xml" title="RSS" href="./index.rss" /></xsl:if>
+
+			<title><xsl:call-template name="title" /></title>
+		</head>
+		<body>
+		<div id="wrap">
+
+		<div id="header">
+		<p id="toplinks">Skip to: <a href="#content">Content</a> | <a href="#sidebar">Navigation</a> | <a href="#footer">Footer</a></p>
+		<h1><a href="index.html">PMP<span class="fade">lib</span></a></h1>
+		<p id="slogan"></p>
+		</div>
+		
+		<div id="content">
+			<xsl:apply-templates select="/page/body" />
+		</div>
+
+		<div id="sidebar">
+
+		<h2>Pages:</h2>
+		<xsl:call-template name="topmenu" />
+
+		<h2>Site news:</h2>
+		<xsl:call-template name="sitenews" />
+
+		<h2>About us</h2>
+		<p>Portable Media Player library (PMPlib) is an open source project for the development of management software and library for various portable media players.</p>
+
+		<p><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=157298&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a></p>
+
+		</div>
+
+		<div id="footer">
+		<xsl:call-template name="footer" />
+		</div>
+
+		</div>
+		</body>
+	</html>
+</xsl:template>
+
+<xsl:template match="body">
+<xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="include-news">
+<xsl:apply-templates select="document('news.xml')/page/body/news/ni[1]" />
+<xsl:apply-templates select="document('news.xml')/page/body/news/ni[2]" />
+<xsl:apply-templates select="document('news.xml')/page/body/news/ni[3]" />
+</xsl:template>
+
+<xsl:template match="makeindex">
+<h2>
+<xsl:choose>
+	<xsl:when test="@caption"><xsl:value-of select="@caption" /></xsl:when>
+	<xsl:otherwise>Table of Contents</xsl:otherwise>
+</xsl:choose>
+</h2>
+<xsl:choose>
+	<xsl:when test="@ordered[.='yes']">
+		<ol class="index">
+		<xsl:apply-templates select="../section" mode="makeindex">
+			<xsl:with-param name="list-element">ol</xsl:with-param>
+		</xsl:apply-templates>
+		</ol>
+	</xsl:when>
+	<xsl:otherwise>
+	<ul class="index">
+		<xsl:apply-templates select="../section" mode="makeindex">
+			<xsl:with-param name="list-element">ul</xsl:with-param>
+		</xsl:apply-templates>
+	</ul>
+	</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+<!--
+  Implementation of <section> element
+-->
+<xsl:template match="section">
+<h2><a name="{generate-id()}"><xsl:value-of select="@caption" /></a></h2>
+<xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="section" mode="makeindex">
+	<xsl:param name="list-element">ul</xsl:param>
+	<li>
+		<a href="#{generate-id()}"><xsl:value-of select="@caption" /></a>
+		<xsl:element name="{$list-element}">
+			<xsl:attribute name="class">index</xsl:attribute>
+			<xsl:apply-templates select="subsection" mode="makeindex">
+			</xsl:apply-templates>
+		</xsl:element>
+	</li>
+</xsl:template>
+
+
+
+<!--
+  Implementation of <subsection> element
+-->
+<xsl:template match="subsection">
+<h3><a name="{generate-id()}"><xsl:value-of select="@caption" /></a></h3>
+<xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="subsection" mode="makeindex">
+	<xsl:param name="list-element">ul</xsl:param>
+	<li>
+		<a href="#{generate-id()}"><xsl:value-of select="@caption" /></a>
+		<xsl:element name="{$list-element}">
+			<xsl:attribute name="class">index</xsl:attribute>
+			<xsl:apply-templates select="subsubsection" mode="makeindex">
+			</xsl:apply-templates>
+		</xsl:element>
+	</li>
+</xsl:template>
+
+<!--
+  Implementation of <subsubsection> element
+-->
+<xsl:template match="subsubsection">
+<h4><a name="{generate-id()}"><xsl:value-of select="@caption" /></a></h4>
+<xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="subsubsection" mode="makeindex">
+	<xsl:param name="list-element">ul</xsl:param>
+	<li>
+		<a href="#{generate-id()}"><xsl:value-of select="@caption" /></a>
+		<xsl:element name="{$list-element}">
+			<xsl:attribute name="class">index</xsl:attribute>
+			<xsl:apply-templates select="subsubsection" mode="makeindex">
+			</xsl:apply-templates>
+		</xsl:element>
+	</li>
+</xsl:template>
+
+
+<xsl:template match="news">
+<h2>News</h2>
+<xsl:apply-templates select="ni" />
+</xsl:template>
+
+<xsl:template match="ni">
+<h3><a name="{generate-id()}"><xsl:value-of select="@caption" /> (<xsl:value-of select="@date" />)</a></h3>
+<xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="ni" mode="title">
+<p>
+<strong><xsl:value-of select="@date" /></strong>
+<br/>
+<xsl:value-of select="@caption" />
+</p>
+</xsl:template>
+
+
+<xsl:template match="a">
+<a>
+	<xsl:attribute name="href"><xsl:value-of select="@href" /></xsl:attribute>
+	<xsl:apply-templates />
+</a>
+</xsl:template>
+
+<xsl:template match="p"><p><xsl:apply-templates /></p></xsl:template>
+<xsl:template match="br"><br/></xsl:template>
+<xsl:template match="i"><i><xsl:apply-templates /></i></xsl:template>
+<xsl:template match="s"><s><xsl:apply-templates /></s></xsl:template>
+<xsl:template match="b"><b><xsl:apply-templates /></b></xsl:template><xsl:template match="u"><u><xsl:apply-templates /></u></xsl:template>
+<xsl:template match="table">
+<div align="center">
+<xsl:if test="@caption"><br/><b><xsl:value-of select="@caption" /></b></xsl:if>
+<table border="1">
+<xsl:if test="@border"><xsl:attribute name="border"><xsl:value-of select="@border" /></xsl:attribute></xsl:if>
+<xsl:apply-templates />
+</table>
+</div>
+</xsl:template>
+<xsl:template match="tr"><tr><xsl:apply-templates /></tr></xsl:template>
+<xsl:template match="td"><td><xsl:if test="@colspan"><xsl:attribute name="colspan"><xsl:value-of select="@colspan" /></xsl:attribute></xsl:if><xsl:apply-templates /></td></xsl:template>
+<xsl:template match="th"><th><xsl:if test="@width"><xsl:attribute name="width"><xsl:value-of select="@width" /></xsl:attribute></xsl:if><xsl:apply-templates /></th></xsl:template>
+
+<xsl:template match="shell"><pre class="shell"><xsl:apply-templates /></pre></xsl:template><xsl:template match="br"><br/></xsl:template>
+<xsl:template match="pre"><pre><xsl:apply-templates /></pre></xsl:template>
+<xsl:template match="code"><code><xsl:apply-templates /></code></xsl:template>
+<xsl:template match="source"><pre class="source"><xsl:apply-templates /></pre></xsl:template>
+<xsl:template match="ul"><ul><xsl:apply-templates /></ul></xsl:template>
+<xsl:template match="ol"><ol><xsl:apply-templates /></ol></xsl:template>
+<xsl:template match="li"><li><xsl:apply-templates /></li></xsl:template>
+<xsl:template match="dl"><dl><xsl:apply-templates /></dl></xsl:template>
+<xsl:template match="dt"><dt><xsl:apply-templates /></dt></xsl:template>
+<xsl:template match="dd"><dd><xsl:apply-templates /></dd></xsl:template>
+
+<xsl:template match="fig"><p align="center">
+<xsl:choose>
+<xsl:when test="@detail-src">
+<a><xsl:attribute name="href">fig/<xsl:value-of select="@detail-src" /></xsl:attribute><img><xsl:attribute name="src">http://www.iriver.co.jp/images/supporter/670_52/<xsl:value-of select="@src" /></xsl:attribute></img></a>
+</xsl:when>
+<xsl:otherwise>
+<img><xsl:attribute name="src">fig/<xsl:value-of select="@src" /></xsl:attribute></img>
+</xsl:otherwise>
+</xsl:choose>
+<xsl:if test="@caption"><br/><b><xsl:value-of select="@caption" /></b></xsl:if></p></xsl:template>
+
+<xsl:template match="img">
+<img><xsl:attribute name="src"><xsl:value-of select="@src" /></xsl:attribute><xsl:choose><xsl:when test="@caption"><xsl:attribute name="alt"><xsl:value-of select="@caption" /></xsl:attribute></xsl:when><xsl:otherwise><xsl:attribute name="alt"><xsl:value-of select="@alt" /></xsl:attribute></xsl:otherwise></xsl:choose></img>
+</xsl:template>
+
+<xsl:template match="jpg"><div align="center">
+<a><xsl:attribute name="href">fig/<xsl:value-of select="@src" />.jpg</xsl:attribute><img><xsl:attribute name="src">fig/<xsl:value-of select="@src" />-s.jpg</xsl:attribute></img></a>
+<xsl:if test="@caption"><br/><b><xsl:value-of select="@caption" /></b></xsl:if>
+</div>
+</xsl:template>
+
+<xsl:template match="gif"><div align="center">
+<a><xsl:attribute name="href">fig/<xsl:value-of select="@src" />.gif</xsl:attribute><img><xsl:attribute name="src">fig/<xsl:value-of select="@src" />-s.gif</xsl:attribute></img></a>
+<xsl:if test="@caption"><br/><b><xsl:value-of select="@caption" /></b></xsl:if>
+</div>
+</xsl:template>
+
+<xsl:template match="section-table">
+<table border="1">
+<xsl:apply-templates mode="section-table"/>
+</table>
+</xsl:template>
+
+<xsl:template match="ts" mode="section-table">
+<xsl:apply-templates mode="section-table">
+	<xsl:with-param name="section_caption" select="@caption" />
+	<xsl:with-param name="num_rowspan" select="count(tr)" />
+</xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="tr" mode="section-table">
+	<xsl:param name="section_caption"></xsl:param>
+	<xsl:param name="num_rowspan">1</xsl:param>
+	<tr>
+	<xsl:choose>
+		<xsl:when test="@superior='1'"><xsl:attribute name="bgcolor">#DDDDFF</xsl:attribute></xsl:when>
+		<xsl:when test="@superior='2'"><xsl:attribute name="bgcolor">#FFDDDD</xsl:attribute></xsl:when>
+		<xsl:otherwise></xsl:otherwise>
+	</xsl:choose>
+	<xsl:if test="position() = 2">
+		<td align="middle" bgcolor="#DDDDDD">
+			<xsl:attribute name="rowspan"><xsl:value-of select="$num_rowspan" /></xsl:attribute>
+			<xsl:value-of select="$section_caption" />
+		</td>
+	</xsl:if>
+	<td><xsl:value-of select="@caption" /></td>
+	<xsl:apply-templates />
+	</tr>
+</xsl:template>
+
+<xsl:template match="thr" mode="section-table">
+<tr bgcolor="#AAAAAA"><xsl:apply-templates /></tr>
+</xsl:template>
+
+
+<!-- Named Template -->
+<xsl:template name="title">PMPlib project <xsl:value-of select="/page/head/title" /></xsl:template>
+
+<xsl:template name="sitenews">
+<xsl:apply-templates select="document('news.xml')/page/body/news/ni[1]" mode="title" />
+<xsl:apply-templates select="document('news.xml')/page/body/news/ni[2]" mode="title" />
+<xsl:apply-templates select="document('news.xml')/page/body/news/ni[3]" mode="title" />
+</xsl:template>
+
+<xsl:template name="topmenu">
+<ul>
+	<li><a href="index.html">Home</a></li>
+	<li><a href="news.html">News</a></li>
...
 
[truncated message content]

[Pmplib-commits] SF.net SVN: pmplib: [31] trunk

[<suc...@us...>]

Revision: 31
Author:   sucknblow
Date:     2006-06-03 12:41:05 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=31&view=rev

Log Message:
-----------
Add Debian packaging files.
These aren't quite 'lintian' clean, yet.

Names libmozjs-dev as a build dependency - this package
only exists in Debian unstable right now.  For building
packages on older Debian suites, or (K)ubuntu, use
libsmjs-dev instead.

Added Paths:
-----------
    trunk/debian/
    trunk/debian/README.Debian
    trunk/debian/changelog
    trunk/debian/compat
    trunk/debian/control
    trunk/debian/copyright
    trunk/debian/docs
    trunk/debian/easypmp.install
    trunk/debian/postinst
    trunk/debian/postrm
    trunk/debian/preinst
    trunk/debian/prerm
    trunk/debian/rules
Added: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	                        (rev 0)
+++ trunk/debian/README.Debian	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,6 @@
+easypmp for Debian
+------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Martin Ellis <mar...@kd...>, Fri,  2 Jun 2006 18:43:00 +0100

Added: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	                        (rev 0)
+++ trunk/debian/changelog	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,6 @@
+pmplib (0.10-1) unstable; urgency=low
+
+  * Initial release Closes: #nnnn  (nnnn is the bug number of your ITP)
+
+ -- Martin Ellis <mar...@kd...>  Fri,  2 Jun 2006 18:43:00 +0100
+

Added: trunk/debian/compat
===================================================================
--- trunk/debian/compat	                        (rev 0)
+++ trunk/debian/compat	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1 @@
+4

Added: trunk/debian/control
===================================================================
--- trunk/debian/control	                        (rev 0)
+++ trunk/debian/control	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,16 @@
+Source: pmplib
+Section: sound
+Priority: optional
+Maintainer: Martin Ellis <mar...@kd...>
+Build-Depends: debhelper (>= 4.0.0), libid3tag0-dev, libmozjs-dev
+Standards-Version: 3.6.2
+
+Package: easypmp
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: create music databases used by portable media players
+ Easypmp is a command line utility used to maintain the music database on
+ a variety of portable music players.
+ .
+ Portable music players use that database to allow the user to browse
+ tracks stored on the device by artist, album, genre or track title.

Added: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	                        (rev 0)
+++ trunk/debian/copyright	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,32 @@
+This package was debianized by Martin Ellis <mar...@kd...> on
+Fri,  2 Jun 2006 18:43:00 +0100.
+
+It was downloaded from http://pmplib.sourceforge.net/
+
+The source code is also available from the project Subversion repository:
+https://svn.sourceforge.net/svnroot/pmplib
+
+The upstream maintainer of this package is
+Nyaochi <ny...@ny...>
+
+Copyright:
+
+   Copyright (C) 2006 Nyaochi <ny...@ny...>
+   Copyright (C) 2006 Martin Ellis <mar...@kd...>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems the complete text of the GNU General Public License can
+be found in '/usr/share/common-licenses/GPL'.

Added: trunk/debian/docs
===================================================================
--- trunk/debian/docs	                        (rev 0)
+++ trunk/debian/docs	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1 @@
+README

Added: trunk/debian/easypmp.install
===================================================================
--- trunk/debian/easypmp.install	                        (rev 0)
+++ trunk/debian/easypmp.install	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,9 @@
+debian/tmp/usr/lib/libucs2.so.*
+debian/tmp/usr/lib/libfilepath.so.*
+debian/tmp/usr/lib/libgmi.so.*
+debian/tmp/usr/lib/libplaylist.so.*
+debian/tmp/usr/lib/libpmp.so.*
+debian/tmp/usr/lib/pmp/*.so
+debian/tmp/usr/lib/pmp/*.la
+debian/tmp/usr/bin/easypmp
+debian/tmp/usr/share/doc/easypmp/*

Added: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	                        (rev 0)
+++ trunk/debian/postinst	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,42 @@
+#! /bin/sh
+# postinst script for easypmp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+    configure)
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: trunk/debian/postrm
===================================================================
--- trunk/debian/postrm	                        (rev 0)
+++ trunk/debian/postrm	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,38 @@
+#! /bin/sh
+# postrm script for easypmp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: trunk/debian/preinst
===================================================================
--- trunk/debian/preinst	                        (rev 0)
+++ trunk/debian/preinst	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,38 @@
+#! /bin/sh
+# preinst script for easypmp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: trunk/debian/prerm
===================================================================
--- trunk/debian/prerm	                        (rev 0)
+++ trunk/debian/prerm	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,38 @@
+#! /bin/sh
+# prerm script for easypmp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: trunk/debian/rules
===================================================================
--- trunk/debian/rules	                        (rev 0)
+++ trunk/debian/rules	2006-06-03 19:41:05 UTC (rev 31)
@@ -0,0 +1,88 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure \
+	  --host=$(DEB_HOST_GNU_TYPE) \
+	  --build=$(DEB_BUILD_GNU_TYPE) \
+	  --prefix=/usr \
+	  --mandir=\$${prefix}/share/man
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	#docbook-to-man debian/easypmp.sgml > easypmp.1
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+	dh_install
+#	dh_installmenu
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps -ldebian/easypmp/usr/lib
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 


Property changes on: trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [32] trunk

[<suc...@us...>]

Revision: 32
Author:   sucknblow
Date:     2006-06-03 15:04:42 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=32&view=rev

Log Message:
-----------
Add missing build dependency.  Now builds on Debian sid using
libmozjs-dev (still works using libsmjs-dev on older systems).

Modified Paths:
--------------
    trunk/configure.in
    trunk/debian/control
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/playlist/Makefile.am
    trunk/lib/playlist/jspl.c
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/configure.in	2006-06-03 22:04:42 UTC (rev 32)
@@ -197,6 +197,8 @@
 AC_SUBST(OGG_LIBS)
 AC_SUBST(VORBIS_LIBS)
 AC_SUBST(VORBISFILE_LIBS)
+AC_SUBST(JS_CFLAGS)
+AC_SUBST(JS_LIBS)
 
 
 dnl ------------------------------------------------------------------

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/debian/control	2006-06-03 22:04:42 UTC (rev 32)
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: Martin Ellis <mar...@kd...>
-Build-Depends: debhelper (>= 4.0.0), libid3tag0-dev, libmozjs-dev
+Build-Depends: debhelper (>= 4.0.0), libvorbis-dev, libid3tag0-dev, libmozjs-dev
 Standards-Version: 3.6.2
 
 Package: easypmp

Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
@@ -21,7 +21,7 @@
 INCLUDES = @INCLUDES@ -I../common
 AM_LDFLAGS = @LDFLAGS@
 
-LDADD = \
+easypmp_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/gmi/libgmi.la \

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/lib/playlist/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
@@ -9,14 +9,15 @@
 	playlist.c \
 	jspl.c
 
-libplaylist_la_CPPFLAGS = $(js_inc)
+libplaylist_la_CPPFLAGS = $(JS_CFLAGS)
 
 libplaylist_la_LDFLAGS = \
+	-no-undefined
+
+libplaylist_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
-	-no-undefined
+	$(JS_LIBS)
 
-libplaylist_la_LIBADD = -lsmjs
-
-AM_CFLAGS = @CFLAGS@ $(js_def)
+AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/playlist/jspl.c
===================================================================
--- trunk/lib/playlist/jspl.c	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/lib/playlist/jspl.c	2006-06-03 22:04:42 UTC (rev 32)
@@ -42,9 +42,11 @@
 #define	XP_WIN
 #include <js/jsapi.h>
 #else
-// Build against external SMJS headers.
+/* Build against external Javascript library headers.
+   XP_UNIX is already defined if we found them by pkgconfig, 
+   but #define here just in case we didn't... */
 #define XP_UNIX
-#include <smjs/jsapi.h>
+#include <jsapi.h>
 #endif
 
 #define	MAX_SOURCE_DEPTH	64


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [34] trunk

[<suc...@us...>]

Revision: 34
Author:   sucknblow
Date:     2006-06-03 16:57:29 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=34&view=rev

Log Message:
-----------
Reduce number of lintian packaging warnings (two left)

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/debian/changelog
    trunk/debian/rules

Removed Paths:
-------------
    trunk/debian/README.Debian
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-03 22:25:38 UTC (rev 33)
+++ trunk/ChangeLog	2006-06-03 23:57:29 UTC (rev 34)
@@ -0,0 +1,7 @@
+
+                ChangeLog file for pmplib
+
+		Changes in 0.11
+- POSIX code updated: now works on Linux.
+- Plugins installed into $(libdir)/pmp
+- Debian packaging scripts available.

Deleted: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	2006-06-03 22:25:38 UTC (rev 33)
+++ trunk/debian/README.Debian	2006-06-03 23:57:29 UTC (rev 34)
@@ -1,6 +0,0 @@
-easypmp for Debian
-------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Martin Ellis <mar...@kd...>, Fri,  2 Jun 2006 18:43:00 +0100

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-06-03 22:25:38 UTC (rev 33)
+++ trunk/debian/changelog	2006-06-03 23:57:29 UTC (rev 34)
@@ -1,6 +1,6 @@
 pmplib (0.10-1) unstable; urgency=low
 
-  * Initial release Closes: #nnnn  (nnnn is the bug number of your ITP)
+  * Initial release Closes: #369975
 
  -- Martin Ellis <mar...@kd...>  Fri,  2 Jun 2006 18:43:00 +0100
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-06-03 22:25:38 UTC (rev 33)
+++ trunk/debian/rules	2006-06-03 23:57:29 UTC (rev 34)
@@ -20,7 +20,7 @@
 
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure \
+	LDFLAGS="$(LDFLAGS) -Wl,-z,defs" ./configure \
 	  --host=$(DEB_HOST_GNU_TYPE) \
 	  --build=$(DEB_BUILD_GNU_TYPE) \
 	  --prefix=/usr \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [38] trunk

[<suc...@us...>]

Revision: 38
Author:   sucknblow
Date:     2006-06-03 18:34:08 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=38&view=rev

Log Message:
-----------
Remove unused NEWS file.

Add enough EXTRA_DISTs in order that a release tarball
can be produced using "make dist-bzip2".

Have I included enough that this works on Cygwin too?

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/gmi/Makefile.am
    trunk/lib/playlist/Makefile.am
    trunk/lib/pmp/Makefile.am

Removed Paths:
-------------
    trunk/NEWS
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -3,8 +3,11 @@
 SUBDIRS = m4 libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui
 
 docdir = $(prefix)/share/doc/@PACKAGE@
-doc_DATA = README NEWS INSTALL COPYING AUTHORS ChangeLog
+doc_DATA = README INSTALL COPYING AUTHORS ChangeLog
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = \
+  autogen.sh \
+  include/os.h
 
+AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4

Deleted: trunk/NEWS
===================================================================

Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -12,6 +12,7 @@
 	device.c \
 	option.c \
 	option.h \
+	getopt.h \
 	util.c \
 	util.h \
 	main.c

Modified: trunk/lib/gmi/Makefile.am
===================================================================
--- trunk/lib/gmi/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/lib/gmi/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -16,5 +16,7 @@
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	-no-undefined
 
+EXTRA_DIST = contrib
+
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/lib/playlist/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -19,5 +19,11 @@
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(JS_LIBS)
 
+EXTRA_DIST = \
+  sample/artist.jspl \
+  sample/artists.jspl \
+  sample/top_ranking.jspl \
+  contrib
+
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/pmp/Makefile.am
===================================================================
--- trunk/lib/pmp/Makefile.am	2006-06-04 01:30:52 UTC (rev 37)
+++ trunk/lib/pmp/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
@@ -18,5 +18,7 @@
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(LIBLTDL)
 
+EXTRA_DIST = pmp_plugin.sym
+
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [50] trunk

[<suc...@us...>]

Revision: 50
Author:   sucknblow
Date:     2006-06-05 15:49:18 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=50&view=rev

Log Message:
-----------
Update changelog

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/debian/changelog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-05 22:35:15 UTC (rev 49)
+++ trunk/ChangeLog	2006-06-05 22:49:18 UTC (rev 50)
@@ -3,5 +3,9 @@
 
 		Changes in 0.11
 - POSIX code updated: now works on Linux.
-- Plugins installed into $(libdir)/pmp
-- Debian packaging scripts available.
+- Bug-fix in playlist conversion for iRiver Plus2
+- Strip words in artist names
+- Plugins installed into $(libdir)/pmplib
+- Debian packaging scripts available (although not policy compliant).
+- U10 1.65 supported
+

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-06-05 22:35:15 UTC (rev 49)
+++ trunk/debian/changelog	2006-06-05 22:49:18 UTC (rev 50)
@@ -1,4 +1,4 @@
-pmplib (0.10-1) unstable; urgency=low
+pmplib (0.11-1) unstable; urgency=low
 
   * Initial release Closes: #369975
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [76] trunk

[<suc...@us...>]

Revision: 76
Author:   sucknblow
Date:     2006-07-01 16:03:29 -0700 (Sat, 01 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=76&view=rev

Log Message:
-----------
* Add ChangeLog entries for 0.12
* Provide better information on licensing.
* Add docs on pmplib structure and roadmap.
* Add a copy of the LGPL, since this applies to
  much of pmplib.
* svn:ignore build system files in ucs2, since
  it's going to stay for now.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/README

Added Paths:
-----------
    trunk/COPYING.LIB
    trunk/doc/
    trunk/doc/roadmap.txt
    trunk/doc/structure.txt

Property Changed:
----------------
    trunk/lib/ucs2/
Added: trunk/COPYING.LIB
===================================================================
--- trunk/COPYING.LIB	                        (rev 0)
+++ trunk/COPYING.LIB	2006-07-01 23:03:29 UTC (rev 76)
@@ -0,0 +1,510 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-29 17:39:59 UTC (rev 75)
+++ trunk/ChangeLog	2006-07-01 23:03:29 UTC (rev 76)
@@ -1,6 +1,13 @@
 
                 ChangeLog file for pmplib
 
+		Changes in 0.12
+- Command line options for easypmp have changed (now easier to type).
+- Easypmp now has a manual page.
+- Support for Samsung YH-920 added.
+- Fixed crash when reading Ogg Vorbis tags.
+- Bug fix for reading playists using iriverplus2 devices.
+
 		Changes in 0.11
 - POSIX code updated: now works on Linux.
 - Bug-fix in playlist conversion for iRiver Plus2

Modified: trunk/README
===================================================================
--- trunk/README	2006-06-29 17:39:59 UTC (rev 75)
+++ trunk/README	2006-07-01 23:03:29 UTC (rev 76)
@@ -1,7 +1,55 @@
                                  PMPLib
-                              Version 0.11
+                              Version 0.12
                        http://pmplib.sourceforge.net/
-                     Copyright (c) 2005-2006 by Nyaochi
 
+* STRUCTURE
+For a description of each component of PMPLib, please see the
+doc/structure.txt file.
 
+* COPYRIGHT AND LICENSING INFORMATION
 
+The programs that comprise PMPLib are released under the GNU General
+Public License (GPL).  These may be found in the frontend directory.
+The library for retrieving tags from music files in the lib/gmi
+directory is also licensed under the GNU General Public License.
+The following text applies to the programs and the gmi library.
+
+    Copyright (c) 2005-2006 Nyaochi <ny...@ny...>
+    Copyright (c) 2006 Martin Ellis <mar...@kd...>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA
+
+The following notice applies to the libraries found in the lib/pmp,
+lib/pmp_portalplayer1, lib/pmp_iriverplus2, lib/pmp_irivnavi,
+lib/ucs2, lib/filepath, and lib/playlist directories.
+
+    Copyright (c) 2005-2006 Nyaochi <ny...@ny...>
+    Copyright (c) 2006 Martin Ellis <mar...@kd...>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public License
+    as published by the Free Software Foundation; either version 2.1
+    of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA

Added: trunk/doc/roadmap.txt
===================================================================
--- trunk/doc/roadmap.txt	                        (rev 0)
+++ trunk/doc/roadmap.txt	2006-07-01 23:03:29 UTC (rev 76)
@@ -0,0 +1,22 @@
+Roadmap for PMPLib
+http://pmplib.sourceforge.net/
+
+This file describes the changes planned for each version of pmplib.
+Note that all plans listed here are subject to change!
+
+Version 0.13
+- Add the photo playlist support for iRiver U10/E10.
+- Separate the source and destination directories for playlist conversion.
+
+Version 0.14
+- ?
+
+Things to be done before 1.0
+- Finalize the programing interfaces in the libraries.
+- Write documents (build instruction, usage, programing interface, etc.)
+
+Long-term plan
+- Support tuner preset conversion.
+- Replace libid3tag, libogg, libvorbis with taglib.
+- Prepare a syncronization plugin for foobar2000 (or Winamp???).
+- Prepare SyncPMP, which will be a syncronization software using libpmp.

Added: trunk/doc/structure.txt
===================================================================
--- trunk/doc/structure.txt	                        (rev 0)
+++ trunk/doc/structure.txt	2006-07-01 23:03:29 UTC (rev 76)
@@ -0,0 +1,52 @@
+Structure of PMPLib
+http://pmplib.sourceforge.net/
+
+This file describes the structure of the source code in the PMPLib
+distribution.
+
+* STRUCTURE
+frontend/easypmp/cui:
+  Program for using PMPlib from the command line (GPL).
+frontend/easypmp/win32gui:
+  Windows program for using PMPlib with graphical user interface
+  (GPL).
+frontend/easypmp/common:
+  Support routines for the above programs (GPL).
+
+lib/pmp:
+  Generic media player support library.  Dynamically loads plugins
+  defined in the lib/pmp_* directories (LGPL).
+
+lib/ucs2:
+  Library for representing and manipulating text encoded using the
+  UCS-2 representation.  Can convert to and from multi-byte
+  string (MBS) representations (LGPL).
+
+lib/gmi:
+  Library for retrieving tags from music files (GPL).
+
+lib/filepath:
+  Library for representing and manipulating paths and file names,
+  including support for different path separators (LGPL).
+
+lib/playlist:
+  Library for reading non-device specific playlist files (for example,
+  .m3u files) (LGPL).
+
+lib/pmp_iriverplus2:
+  Support library for
+    * iRiver H10Jnr; and
+    * iRiver U10 devices.
+  (LGPL)
+
+lib/pmp_portalplayer1:
+  Support library for
+    * MEDION MDJuke220 and MDJuke440;
+    * Samsung YH-820, YH-920 and YH-925;
+    * iRiver H10 UMS; and
+    * iRiver H10 MTP (with emergency connect mode) devices.
+  (LGPL)
+
+lib/pmp_irivnavi:
+  Support library for iRiver H100 and H300 devices.
+  (LGPL)


Property changes on: trunk/lib/ucs2
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [109] trunk

[<ny...@us...>]

Revision: 109
Author:   nyaochi
Date:     2006-07-02 05:37:13 -0700 (Sun, 02 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=109&view=rev

Log Message:
-----------
Updated the configure script for nl_langinfo()

Modified Paths:
--------------
    trunk/configure.in

Added Paths:
-----------
    trunk/m4/codeset.m4
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-07-02 12:26:56 UTC (rev 108)
+++ trunk/configure.in	2006-07-02 12:37:13 UTC (rev 109)
@@ -150,6 +150,7 @@
 
 dnl Check for iconv library
 AM_ICONV
+AM_LANGINFO_CODESET
 
 dnl Checks for id3tag
 AC_ARG_WITH(

Added: trunk/m4/codeset.m4
===================================================================
--- trunk/m4/codeset.m4	                        (rev 0)
+++ trunk/m4/codeset.m4	2006-07-02 12:37:13 UTC (rev 109)
@@ -0,0 +1,21 @@
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [111] trunk

[<suc...@us...>]

Revision: 111
Author:   sucknblow
Date:     2006-07-02 14:01:53 -0700 (Sun, 02 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=111&view=rev

Log Message:
-----------
Clarify copyright information

Modified Paths:
--------------
    trunk/README
    trunk/debian/copyright
Modified: trunk/README
===================================================================
--- trunk/README	2006-07-02 13:08:55 UTC (rev 110)
+++ trunk/README	2006-07-02 21:01:53 UTC (rev 111)
@@ -10,10 +10,12 @@
 
 The programs that comprise PMPLib are released under the GNU General
 Public License (GPL).  These may be found in the frontend directory.
-The library for retrieving tags from music files in the lib/gmi
-directory is also licensed under the GNU General Public License.
-The following text applies to the programs and the gmi library.
+The support library for these frontends in the lib/pmp directory, and
+the library for retrieving tags from music files in the lib/gmi
+directory are also licensed under the GNU General Public License.
 
+The following text applies to the programs and the pmp and gmi
+libraries.
     Copyright (c) 2005-2006 Nyaochi <ny...@ny...>
     Copyright (c) 2006 Martin Ellis <mar...@kd...>
 
@@ -32,7 +34,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA
 
-The following notice applies to the libraries found in the lib/pmp,
+The following notice applies to the libraries found in the
 lib/pmp_portalplayer1, lib/pmp_iriverplus2, lib/pmp_irivnavi,
 lib/ucs2, lib/filepath, and lib/playlist directories.
 
@@ -53,3 +55,31 @@
     License along with this library; if not, write to the Free
     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
     02110-1301 USA
+
+The following notice applies to the rel2abs.c file in the lib/filepath
+directory.
+
+Copyright (c) 1997 Shigio Yamaguchi. All rights reserved.
+Copyright (c) 1999 Tama Communications Corporation. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials provided
+       with the distribution.
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2006-07-02 13:08:55 UTC (rev 110)
+++ trunk/debian/copyright	2006-07-02 21:01:53 UTC (rev 111)
@@ -11,22 +11,91 @@
 
 Copyright:
 
-   Copyright (C) 2006 Nyaochi <ny...@ny...>
-   Copyright (C) 2006 Martin Ellis <mar...@kd...>
+The programs that comprise PMPLib are released under the GNU General
+Public License (GPL).  These may be found in the frontend directory of
+the source distribution.  The support library for these frontends in
+the lib/pmp directory, and the library for retrieving tags from music
+files in the lib/gmi directory are also licensed under the GNU General
+Public License.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+The following text applies to the programs and the pmp and gmi
+libraries.
+    Copyright (c) 2005-2006 Nyaochi <ny...@ny...>
+    Copyright (c) 2006 Martin Ellis <mar...@kd...>
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA
+
 On Debian systems the complete text of the GNU General Public License can
 be found in '/usr/share/common-licenses/GPL'.
+
+The following notice applies to the libraries found in the
+lib/pmp_portalplayer1, lib/pmp_iriverplus2, lib/pmp_irivnavi,
+lib/ucs2, lib/filepath, and lib/playlist directories.
+
+    Copyright (c) 2005-2006 Nyaochi <ny...@ny...>
+    Copyright (c) 2006 Martin Ellis <mar...@kd...>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public License
+    as published by the Free Software Foundation; either version 2.1
+    of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+The following notice applies to the rel2abs.c file in the lib/filepath
+directory.
+
+Copyright (c) 1997 Shigio Yamaguchi. All rights reserved.
+Copyright (c) 1999 Tama Communications Corporation. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials provided
+       with the distribution.
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+
+The Debian packaging is
+    Copyright (c) 2006 Martin Ellis <mar...@kd...>
+and is licensed under the GPL, see above.
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [112] trunk

[<suc...@us...>]

Revision: 112
Author:   sucknblow
Date:     2006-07-02 14:19:28 -0700 (Sun, 02 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=112&view=rev

Log Message:
-----------
Use the new FSF address.

Modified Paths:
--------------
    trunk/README
    trunk/debian/copyright
Modified: trunk/README
===================================================================
--- trunk/README	2006-07-02 21:01:53 UTC (rev 111)
+++ trunk/README	2006-07-02 21:19:28 UTC (rev 112)
@@ -31,8 +31,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA
 
 The following notice applies to the libraries found in the
 lib/pmp_portalplayer1, lib/pmp_iriverplus2, lib/pmp_irivnavi,

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2006-07-02 21:01:53 UTC (rev 111)
+++ trunk/debian/copyright	2006-07-02 21:19:28 UTC (rev 112)
@@ -35,8 +35,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA
 
 On Debian systems the complete text of the GNU General Public License can
 be found in '/usr/share/common-licenses/GPL'.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [137] trunk

[<suc...@us...>]

Revision: 137
Author:   sucknblow
Date:     2006-07-27 19:16:31 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=137&view=rev

Log Message:
-----------
Javascript engine is now an optional dependency
 * Gives a warning if the engine is not found
 * Should really remove the options from the UI
   where such features aren't present (TODO)
Use internal getopt if the platform doesn't provide it:
 * Now compiles on OS X.

Modified Paths:
--------------
    trunk/AUTHORS
    trunk/configure.in
    trunk/doc/roadmap.txt
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/playlist/Makefile.am
    trunk/lib/playlist/playlist.c
    trunk/m4/smjs.m4
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2006-07-28 01:40:13 UTC (rev 136)
+++ trunk/AUTHORS	2006-07-28 02:16:31 UTC (rev 137)
@@ -1 +1,2 @@
-Nyaochi
+Nyaochi <ny...@ny...>
+Martin Ellis <mar...@kd...>

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-07-28 01:40:13 UTC (rev 136)
+++ trunk/configure.in	2006-07-28 02:16:31 UTC (rev 137)
@@ -28,7 +28,7 @@
 dnl Initialization for automake
 dnl ------------------------------------------------------------------
 AM_INIT_AUTOMAKE(pmplib, 0.11)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE
 AM_C_PROTOTYPES
 
@@ -201,9 +201,24 @@
 AC_SUBST(JS_CFLAGS)
 AC_SUBST(JS_LIBS)
 
+AM_CONDITIONAL(have_jsapi, test -n "$JS_CFLAGS")
+AM_CONDITIONAL(have_getopt, test "$ac_cv_header_getopt_h" = "yes")
 
 dnl ------------------------------------------------------------------
 dnl Output the configure results.
 dnl ------------------------------------------------------------------
 AC_CONFIG_FILES(Makefile m4/Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile)
+
+if test -n "$JS_CFLAGS" ; then
+  AC_DEFINE([HAVE_JSAPI_H], 1, [Define if you have the jsapi.h header])
+fi
+
 AC_OUTPUT
+
+if test -z "$JS_CFLAGS" ; then
+  if test "$enable_js" != no ; then
+    echo
+    echo "    Warning: JavaScript interpreter engine not found"
+  fi
+  echo "    pmplib will be build without support for JavaScript playlists."
+fi

Modified: trunk/doc/roadmap.txt
===================================================================
--- trunk/doc/roadmap.txt	2006-07-28 01:40:13 UTC (rev 136)
+++ trunk/doc/roadmap.txt	2006-07-28 02:16:31 UTC (rev 137)
@@ -16,8 +16,6 @@
 - Write documents (build instruction, usage, programing interface, etc.)
 
 Long-term plan
-- Make the JavaScript engine an optional dependency (it's terrible trying
-  to build easypmp without pre-built packages of this)
 - Analyze database format (4th generation) used in iriver E10. Implement
   database reader/writer for iriver E10.
 - Support tuner preset conversion.

Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-07-28 01:40:13 UTC (rev 136)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-07-28 02:16:31 UTC (rev 137)
@@ -4,6 +4,10 @@
 man_MANS = easypmp.1
 EXTRA_DIST = ${man_MANS} getopt.c getopt1.c
 
+if !have_getopt
+  getopt = getopt.c getopt1.c
+endif
+
 easypmp_SOURCES = \
 	../common/easypmp.h \
 	../common/database.c \
@@ -13,6 +17,7 @@
 	option.c \
 	option.h \
 	getopt.h \
+	$(getopt) \
 	util.c \
 	util.h \
 	main.c

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-07-28 01:40:13 UTC (rev 136)
+++ trunk/lib/playlist/Makefile.am	2006-07-28 02:16:31 UTC (rev 137)
@@ -1,12 +1,17 @@
 # $Id$
 
-jspldir = $(prefix)/share/@PACKAGE@/jspl
-jspl_DATA = \
+if have_jsapi
+  jspl_files = \
 	jspl/playlist.js \
 	jspl/artist.jspl \
 	jspl/artists.jspl \
 	jspl/top_ranking.jspl
+  jspl_c = jspl.c
 
+  jspldir = $(prefix)/share/@PACKAGE@/jspl
+  jspl_DATA = $(jspl_files)
+endif
+
 lib_LTLIBRARIES = libpmpplaylist.la
 
 libpmpplaylist_la_SOURCES = \
@@ -14,7 +19,7 @@
 	rw_m3u.c \
 	rw_pls.c \
 	playlist.c \
-	jspl.c
+	$(jspl_c)
 
 libpmpplaylist_la_CPPFLAGS = $(JS_CFLAGS) -DJS_THREADSAFE
 

Modified: trunk/lib/playlist/playlist.c
===================================================================
--- trunk/lib/playlist/playlist.c	2006-07-28 01:40:13 UTC (rev 136)
+++ trunk/lib/playlist/playlist.c	2006-07-28 02:16:31 UTC (rev 137)
@@ -40,10 +40,15 @@
 static const ucs2char_t ucs2cs_m3u[] = {'.','m','3','u',0};
 static const ucs2char_t ucs2cs_m3u8[] = {'.','m','3','u','8',0};
 static const ucs2char_t ucs2cs_pls[] = {'.','p','l','s',0};
+
+#ifdef HAVE_JSAPI_H
 static const ucs2char_t ucs2cs_jspl[] = {'.','j','s','p','l',0};
+#endif/*HAVE_JSAPI_H*/
 
 int playlist_m3u_read(playlists_t* pls, const ucs2char_t *filename, int is_utf8);
 int playlist_pls_read(playlists_t* pls, const ucs2char_t *filename);
+
+#ifdef HAVE_JSAPI_H
 int playlist_jspl_read(
 	playlists_t* pls,
 	const ucs2char_t *filename,
@@ -53,6 +58,7 @@
 	playlist_callback_t callback,
 	void *instance
 	);
+#endif/*HAVE_JSAPI_H*/
 
 void playlist_init(playlists_t* pls)
 {
@@ -84,8 +90,10 @@
 		return playlist_m3u_read(pls, filename, 1);
 	} else if (filepath_hasext(filename, ucs2cs_pls)) {
 		return playlist_pls_read(pls, filename);
+#ifdef HAVE_JSAPI_H
 	} else if (records && filepath_hasext(filename, ucs2cs_jspl)) {
 		return playlist_jspl_read(pls, filename, path_to_include, records, num_records, callback, instance);
+#endif/*HAVE_JSAPI_H*/
 	} else {
 		return -1;
 	}
@@ -138,9 +146,13 @@
 	ret |= filepath_hasext(filename, ucs2cs_m3u);
 	ret |= filepath_hasext(filename, ucs2cs_m3u8);
 	ret |= filepath_hasext(filename, ucs2cs_pls);
+
+#ifdef HAVE_JSAPI_H
 	if (flag & PLAYLIST_JSPL) {
 		ret |= filepath_hasext(filename, ucs2cs_jspl);
 	}
+#endif/*HAVE_JSAPI_H*/
+
 	return ret;
 }
 

Modified: trunk/m4/smjs.m4
===================================================================
--- trunk/m4/smjs.m4	2006-07-28 01:40:13 UTC (rev 136)
+++ trunk/m4/smjs.m4	2006-07-28 02:16:31 UTC (rev 137)
@@ -35,22 +35,8 @@
 	[#define XP_UNIX])
     ])
 
-AC_DEFUN([AC_PATH_SPIDERMONKEY],
-   [AC_ARG_WITH([spidermonkey],
-		[AS_HELP_STRING([--with-spidermonkey],[prefix where libjs/libsmjs is installed (optional)])],
-		[JS_CFLAGS="-I$withval"], [JS_CFLAGS=''])
-
-    AC_ARG_ENABLE([libjs],
-	[AS_HELP_STRING([--disable-libjs],[don't look for libjs/libsmjs])])
-    AC_ARG_ENABLE([mozjs],
-	[AS_HELP_STRING([--disable-mozjs],[don't look for Mozilla libmozjs])])
-    AC_ARG_ENABLE([ffjs],
-	[AS_HELP_STRING([--disable-ffjs], [don't look for Firefox libmozjs])])
-
-    test "$enable_libjs$enable_mozjs$enable_ffjs" = "nonono" &&
-      AC_MSG_ERROR([cannot search for no JS library - try removing a --disable-*js option])
-
-    if test x"$JS_CFLAGS" = x; then
+m4_define([spidermonkey_checkall],
+  [if test x"$JS_CFLAGS" = x; then
       AC_MSG_NOTICE([looking for the Spidermonkey Javascript library in various places.])
 
       # Try libsmjs/libjs
@@ -114,7 +100,7 @@
       # Failed...
 
       if test x"$JS_CFLAGS" = x; then
-	AC_MSG_ERROR([libjs not found])
+	AC_MSG_WARN([libjs not found])
       fi
     else
       saved_CFLAGS="$CFLAGS"
@@ -132,10 +118,33 @@
 	 JS_LIBS="`spidermonkey_locate_lib([$JS_LIBS])`js"
 	 AC_DEFINE(HAVE_LIBSMJS, 1, [Define if you have jsapi.h])
 	],
-	[AC_MSG_ERROR([libjs not found])],
+	[AC_MSG_WARN([libjs not found])],
 	[#define XP_UNIX])
       CFLAGS="$saved_CFLAGS"
     fi
     AC_SUBST(JS_CFLAGS)
     AC_SUBST(JS_LIBS)
+])
+
+AC_DEFUN([AC_PATH_SPIDERMONKEY],
+   [AC_ARG_WITH([spidermonkey],
+		[AS_HELP_STRING([--with-spidermonkey],[prefix where libjs/libsmjs is installed (optional)])],
+		[JS_CFLAGS="-I$withval"], [JS_CFLAGS=''])
+
+    AC_ARG_ENABLE([js],
+        [AS_HELP_STRING([--disable-js], [don't build Javascript playlist support])])
+    AC_ARG_ENABLE([libjs],
+	[AS_HELP_STRING([--disable-libjs],[don't look for libjs/libsmjs])])
+    AC_ARG_ENABLE([mozjs],
+	[AS_HELP_STRING([--disable-mozjs],[don't look for Mozilla libmozjs])])
+    AC_ARG_ENABLE([ffjs],
+	[AS_HELP_STRING([--disable-ffjs], [don't look for Firefox libmozjs])])
+
+dnl    test "$enable_libjs$enable_mozjs$enable_ffjs" = "nonono" &&
+dnl      AC_MSG_ERROR([cannot search for no JS library - try removing a --disable-*js option])
+
+    if test "$enable_js" != "no" ; then
+      spidermonkey_checkall
+    fi
+
    ])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [153] trunk

[<suc...@us...>]

Revision: 153
Author:   sucknblow
Date:     2006-07-29 15:06:04 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=153&view=rev

Log Message:
-----------
Bump version number.

Modified Paths:
--------------
    trunk/configure.in
    trunk/debian/changelog
    trunk/frontend/easypmp/cui/main.c
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-07-29 21:56:41 UTC (rev 152)
+++ trunk/configure.in	2006-07-29 22:06:04 UTC (rev 153)
@@ -27,7 +27,7 @@
 dnl ------------------------------------------------------------------
 dnl Initialization for automake
 dnl ------------------------------------------------------------------
-AM_INIT_AUTOMAKE(pmplib, 0.11)
+AM_INIT_AUTOMAKE(pmplib, 0.12)
 AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE
 AM_C_PROTOTYPES

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-29 21:56:41 UTC (rev 152)
+++ trunk/debian/changelog	2006-07-29 22:06:04 UTC (rev 153)
@@ -1,6 +1,6 @@
-pmplib (0.11-1) unstable; urgency=low
+pmplib (0.12-1) unstable; urgency=low
 
   * Initial release Closes: #369975
 
- -- Martin Ellis <mar...@kd...>  Fri,  2 Jun 2006 18:43:00 +0100
+ -- Martin Ellis <mar...@kd...>  Sat, 29 Jul 2006 23:05:36 +0100
 

Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-07-29 21:56:41 UTC (rev 152)
+++ trunk/frontend/easypmp/cui/main.c	2006-07-29 22:06:04 UTC (rev 153)
@@ -52,7 +52,7 @@
 #endif
 
 #define	APPLICATION_S	"EasyPMP [CUI]"
-#define	VERSION_S		"0.11 alpha"
+#define	VERSION_S		"0.12 alpha"
 #define	COPYRIGHT_S		"Copyright (c) 2005-2006 Nyaochi"
 
 int database_dump(pmp_t* pmp, FILE *fpo, int level);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [154] trunk

[<suc...@us...>]

Revision: 154
Author:   sucknblow
Date:     2006-07-29 16:49:07 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=154&view=rev

Log Message:
-----------
"easypmp -ct the" should strip 'the' from 'The Proclaimers'
but not 'Therapy?'.  It should also strip the space.

i.e. we want to see 'Proclaimers' and 'Therapy?', and
not ' Proclaimers' or 'rapy?'.

Fix JSPL warning which wasn't displaying when using --create.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/frontend/easypmp/cui/main.c
    trunk/lib/gmi/gmi.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-07-29 22:06:04 UTC (rev 153)
+++ trunk/ChangeLog	2006-07-29 23:49:07 UTC (rev 154)
@@ -15,6 +15,7 @@
 - Bug fix in string conversion with iconv.
 - Bug fix for stripping words such as 'the' in artist names.
 - Bug fix for reading playists using iriverplus2 devices.
+- POSIX release now compiles on non-GNU systems, e.g. Mac OS X.
 - Show error messages from SpiderMonkey (JavaScript engine).
 - Information about copyright owners and licenses now more comprehensive.
 

Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-07-29 22:06:04 UTC (rev 153)
+++ trunk/frontend/easypmp/cui/main.c	2006-07-29 23:49:07 UTC (rev 154)
@@ -346,15 +346,15 @@
 	if (opt.verb & MODE_PLAYLIST) {
 		// Read the database for JSPL.
 		if ((opt.verb & MODE_PLAYLIST_JSPL) && (!records)) {
-#ifdef HAVE_JSAPI_H
 			easypmp_database_read(pmp, &opt, &records, &num_records, easypmp_progress, NULL);
-#else
+		}
+#ifndef HAVE_JSAPI_H
+		if(opt.verb & MODE_PLAYLIST_JSPL) {
 			fprintf(fpe, "Warning: Ignoring -j/--jspl option.  This version of easypmp\n");
 			fprintf(fpe, "         was built without support for JavaScript playlists.\n");
+		}
 #endif
-		}
 		easypmp_playlist(&playlists, &musics, pmp, &opt, records, num_records, easypmp_progress, NULL);
-
 	}
 	if (opt.verb & MODE_DATABASE_REPR) {
 		database_dump(pmp, fpo, opt.repr_level);

Modified: trunk/lib/gmi/gmi.c
===================================================================
--- trunk/lib/gmi/gmi.c	2006-07-29 22:06:04 UTC (rev 153)
+++ trunk/lib/gmi/gmi.c	2006-07-29 23:49:07 UTC (rev 154)
@@ -223,10 +223,33 @@
 	if ((flag & GMIF_STRIP_ARTIST) && strip_words && info->artist) {
 		int i;
 		for (i = 0;i < num_strip_words;++i) {
-			if (ucs2incmp(info->artist, strip_words[i], ucs2len(strip_words[i])) == 0) {
-				strip_head_letters(info->artist, ucs2len(strip_words[i]));
+
+			/* If the artist name doesn't start with this
+			   word, then ignore it. */
+			size_t length = ucs2len(strip_words[i]);
+			if (ucs2incmp(info->artist, strip_words[i], length) != 0) {
 				break;
 			}
+			/* OK. The artist name starts with this word.
+			   Suppose the 'strip word' is 'the' - we
+			   don't want to remove it if there's no
+			   subsequent space.  For example, we don't
+			   want to strip 'The' from 'Therapy?'.
+
+			   So we need to check the next character in
+			   the artist name for a space, remembering
+			   that there might not actually be a next
+			   character...
+			 */
+			size_t artist_length = ucs2len(info->artist);
+			if (artist_length == length) {
+				/* Artist name is (exactly) the word
+				   to be stripped */
+				info->artist[0] = 0;
+			} else if (artist_length > length && info->artist[length] == ' ') {
+				/* Remove the subsequent space too. */
+				strip_head_letters(info->artist, length + 1);
+			}
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [156] trunk

[<suc...@us...>]

Revision: 156
Author:   sucknblow
Date:     2006-07-29 18:26:30 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=156&view=rev

Log Message:
-----------
Move project into a subdirectory of trunk.

Added Paths:
-----------
    trunk/pmplib/
    trunk/pmplib/AUTHORS
    trunk/pmplib/COPYING
    trunk/pmplib/COPYING.LIB
    trunk/pmplib/ChangeLog
    trunk/pmplib/INSTALL
    trunk/pmplib/Makefile.am
    trunk/pmplib/README
    trunk/pmplib/autogen.sh
    trunk/pmplib/configure.in
    trunk/pmplib/debian/
    trunk/pmplib/doc/
    trunk/pmplib/frontend/
    trunk/pmplib/include/
    trunk/pmplib/lib/
    trunk/pmplib/m4/
    trunk/pmplib/pmp.sln

Removed Paths:
-------------
    trunk/AUTHORS
    trunk/COPYING
    trunk/COPYING.LIB
    trunk/ChangeLog
    trunk/INSTALL
    trunk/Makefile.am
    trunk/README
    trunk/autogen.sh
    trunk/configure.in
    trunk/debian/
    trunk/doc/
    trunk/frontend/
    trunk/include/
    trunk/lib/
    trunk/m4/
    trunk/pmp.sln
Deleted: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2006-07-30 00:43:41 UTC (rev 155)
+++ trunk/AUTHORS	2006-07-30 01:26:30 UTC (rev 156)
@@ -1,2 +0,0 @@
-Nyaochi <ny...@ny...>
-Martin Ellis <mar...@kd...>

Deleted: trunk/COPYING
===================================================================
--- trunk/COPYING	2006-07-30 00:43:41 UTC (rev 155)
+++ trunk/COPYING	2006-07-30 01:26:30 UTC (rev 156)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

Deleted: trunk/COPYING.LIB
===================================================================
--- trunk/COPYING.LIB	2006-07-30 00:43:41 UTC (rev 155)
+++ trunk/COPYING.LIB	2006-07-30 01:26:30 UTC (rev 156)
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

Deleted: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-07-30 00:43:41 UTC (rev 155)
+++ trunk/ChangeLog	2006-07-30 01:26:30 UTC (rev 156)
@@ -1,69 +0,0 @@
-
-                ChangeLog file for pmplib
-
-		Changes in 0.12 (TBD)
-- Command line options for easypmp have changed (now easier to type).
-- Easypmp now has a manual page.
-- Support for Samsung YH-920 added.
-- Support iriver H10 [5GB/6GB] UMS firmware 2.53.
-- Store file timestamp in Samsung databases to improve database update.
-- Automatically detect local character encoding.
-- The --list-devices option now outputs to stdout, rather than stderr.
-- Fixed crash when updating databases on Samsung devices.
-- Fixed crash when reading Ogg Vorbis tags.
-- Fixed crash when using --strip-words on files with no artist tag.
-- Bug fix in string conversion with iconv.
-- Bug fix for stripping words such as 'the' in artist names.
-- Bug fix for reading playists using iriverplus2 devices.
-- POSIX release now compiles on non-GNU systems, e.g. Mac OS X.
-- Show error messages from SpiderMonkey (JavaScript engine).
-- Information about copyright owners and licenses now more comprehensive.
-
-		Changes in 0.11 (2006-06-06)
-- POSIX code updated: now works on Linux.
-- Bug-fix in playlist conversion for iRiver Plus2.
-- Strip words in artist names.
-- Plugins installed into $(libdir)/pmplib.
-- Debian packaging scripts available (although not policy compliant).
-- U10 1.65 supported.
-
-		Changes in 0.10 (2006-05-25)
-- U10 1.64 supported.
-
-		Changes in 0.9 (2006-05-06)
-- New JavaScript playlist (JSPL) specification for better flexibility.
-- Bug fix for JSPL when database rebuild/update is not specified.
-- Support for Samsung YH-820 added.
-- Support for Samsung YH-925 added.
-- PMPlib now has an official web site (http://pmplib.sourceforge.net/).
-
-		Changes in 0.8 (2006-02-13)
-- JavaScript playlist (JSPL) added.
-- EasyPMP now utilizes folder/file names to obtain media information.
-- Bug fix for playlist conversion using PortalPlayer devices.
-
-		Changes in 0.7 (2006-02-11)
-- Support for Medion MDJuke 440 and MDJuke220 added.
-
-		Changes in 0.6 (2006-01-24)
-- Bug fix in database writer for iriverplus2 devices.
-
-		Changes in 0.5 (2006-01-09)
-- EasyPMP now has Win32 GUI.
-
-		Changes in 0.4 (2006-01-03)
-- Update mode for media database and playlist conversion implemented.
-- Command line options for EasyPMP have changed.
-- License changes (GPL to LGPL) for some DLLs.
-
-		Changes in 0.3 (2006-01-01)
-- Support for iriver H10 UMS and MTP players added.
-- Playlist conversion for all supported devices implemented.
-- Bug fix in database writer for iriverplus2 devices.
-- Internal libraries released as dynamic link libraries (DLLs).
-
-		Changes in 0.2 (2006-12-24)
-- Support for iriver H100/300 series (aka. iRivNavi.iDB) added.
-
-		Changes in 0.1 (2006-12-23)
-- Initial attempt to read/write media database for iriverplus2 devices.

Deleted: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2006-07-30 00:43:41 UTC (rev 155)
+++ trunk/INSTALL	2006-07-30 01:26:30 UTC (rev 156)
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

Deleted: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-07-30 00:43:41 UTC (rev 155)
+++ trunk/Makefile.am	2006-07-30 01:26:30 UTC (rev 156)
@@ -1,13 +0,0 @@
-# $Id$
-
-SUBDIRS = m4 libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui
-
-docdir = $(prefix)/share/doc/@PACKAGE@
-doc_DATA = README INSTALL COPYING AUTHORS ChangeLog
-
-EXTRA_DIST = \
-  autogen.sh \
-  include/os.h
-
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4

Deleted: trunk/README
===================================================...
 
[truncated message content]

[Pmplib-commits] SF.net SVN: pmplib: [181] trunk

[<suc...@us...>]

Revision: 181
Author:   sucknblow
Date:     2006-08-09 17:19:45 -0700 (Wed, 09 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=181&view=rev

Log Message:
-----------
Scripts for setting up emacs for pmplib codebase.

Added Paths:
-----------
    trunk/scripts/
    trunk/scripts/emacs/
    trunk/scripts/emacs/javascript.el
    trunk/scripts/emacs/pmp-emacs.el
Added: trunk/scripts/emacs/javascript.el
===================================================================
--- trunk/scripts/emacs/javascript.el	                        (rev 0)
+++ trunk/scripts/emacs/javascript.el	2006-08-10 00:19:45 UTC (rev 181)
@@ -0,0 +1,641 @@
+;;; javascript.el --- Major mode for editing JavaScript source text
+
+;; Copyright (C) 2006 Karl Landström
+
+;; Author: Karl Landström <kl...@co...>
+;; Maintainer: Karl Landström <kl...@co...>
+;; Version: 2.0 Beta 6
+;; Date: 2006-07-31
+;; Keywords: languages, oop
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+;;
+;; The main features of this JavaScript mode are syntactic
+;; highlighting (enabled with `font-lock-mode' or
+;; `global-font-lock-mode'), automatic indentation and filling of
+;; comments.
+;;
+;; This package has (only) been tested with GNU Emacs 21.4 (the latest
+;; stable release).
+;;
+;; Installation:
+;;
+;; Put this file in a directory where Emacs can find it (`C-h v
+;; load-path' for more info). Then add the following lines to your
+;; Emacs initialization file:
+;; 
+;;    (add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode))
+;;    (autoload 'javascript-mode "javascript" nil t)
+;;    
+;; General Remarks:
+;; 
+;; This mode assumes that block comments are not nested inside block
+;; comments and that strings do not contain line breaks.
+;; 
+;; Exported names start with "javascript-" whereas private names start
+;; with "js-".
+;; 
+;; Changes:
+;;
+;; See javascript.el.changelog.
+
+;;; Code:
+
+(require 'cc-mode)
+(require 'font-lock)
+(require 'newcomment)
+
+(defgroup javascript nil 
+  "Customization variables for `javascript-mode'."
+  :group 'languages)
+
+(defcustom javascript-indent-level 3 
+  "Number of spaces for each indentation step."
+  :type 'integer
+  :group 'javascript)
+
+(defcustom javascript-auto-indent-flag t
+  "Automatic indentation with punctuation characters. If non-nil, the
+current line is indented when certain punctuations are inserted."
+  :type 'boolean
+  :group 'javascript)
+
+
+;; --- Keymap ---
+
+(defvar javascript-mode-map nil 
+  "Keymap used in JavaScript mode.")
+
+(unless javascript-mode-map 
+  (setq javascript-mode-map (make-sparse-keymap)))
+
+(when javascript-auto-indent-flag
+  (mapc (lambda (key) 
+	  (define-key javascript-mode-map key 'javascript-insert-and-indent))
+	'("{" "}" "(" ")" ":" ";" ",")))
+
+(defun javascript-insert-and-indent (key)
+  "Run command bound to key and indent current line. Runs the command
+bound to KEY in the global keymap and indents the current line."
+  (interactive (list (this-command-keys)))
+  (call-interactively (lookup-key (current-global-map) key))
+  (indent-according-to-mode))
+
+
+;; --- Syntax Table And Parsing ---
+
+(defvar javascript-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (c-populate-syntax-table table)
+
+    ;; The syntax class of underscore should really be `symbol' ("_")
+    ;; but that makes matching of tokens much more complex as e.g.
+    ;; "\\<xyz\\>" matches part of e.g. "_xyz" and "xyz_abc". Defines
+    ;; it as word constituent for now.
+    (modify-syntax-entry ?_ "w" table)
+
+    table)
+  "Syntax table used in JavaScript mode.")
+
+
+(defun js-re-search-forward-inner (regexp &optional bound count)
+  "Auxiliary function for `js-re-search-forward'."
+  (let ((parse)
+        (saved-point (point-min)))
+    (while (> count 0)
+      (re-search-forward regexp bound)
+      (setq parse (parse-partial-sexp saved-point (point)))
+      (cond ((nth 3 parse)
+             (re-search-forward 
+              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse))) 
+              (save-excursion (end-of-line) (point)) t))
+            ((nth 7 parse)
+             (forward-line))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?\/) (eq (char-after) ?\*)))
+             (re-search-forward "\\*/"))
+            (t
+             (setq count (1- count))))
+      (setq saved-point (point))))
+  (point))
+
+
+(defun js-re-search-forward (regexp &optional bound noerror count)
+  "Search forward but ignore strings and comments. Invokes
+`re-search-forward' but treats the buffer as if strings and
+comments have been removed."
+  (let ((saved-point (point))
+        (search-expr 
+         (cond ((null count)
+                '(js-re-search-forward-inner regexp bound 1))
+               ((< count 0)
+                '(js-re-search-backward-inner regexp bound (- count)))
+               ((> count 0)
+                '(js-re-search-forward-inner regexp bound count)))))
+    (condition-case err
+        (eval search-expr)
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+
+(defun js-re-search-backward-inner (regexp &optional bound count)
+  "Auxiliary function for `js-re-search-backward'."
+  (let ((parse)
+        (saved-point (point-min)))
+    (while (> count 0)
+      (re-search-backward regexp bound)
+      (when (and (> (point) (point-min))
+                 (save-excursion (backward-char) (looking-at "/[/*]")))
+        (forward-char))
+      (setq parse (parse-partial-sexp saved-point (point)))
+      (cond ((nth 3 parse)
+             (re-search-backward
+              (concat "\\([^\\]\\|^\\)" (string (nth 3 parse))) 
+              (save-excursion (beginning-of-line) (point)) t))
+            ((nth 7 parse) 
+             (goto-char (nth 8 parse)))
+            ((or (nth 4 parse)
+                 (and (eq (char-before) ?/) (eq (char-after) ?*)))
+             (re-search-backward "/\\*"))
+            (t
+             (setq count (1- count))))))
+  (point))
+
+
+(defun js-re-search-backward (regexp &optional bound noerror count)
+  "Search backward but ignore strings and comments. Invokes
+`re-search-backward' but treats the buffer as if strings and
+comments have been removed."
+  (let ((saved-point (point))
+        (search-expr 
+         (cond ((null count)
+                '(js-re-search-backward-inner regexp bound 1))
+               ((< count 0)
+                '(js-re-search-forward-inner regexp bound (- count)))
+               ((> count 0)
+                '(js-re-search-backward-inner regexp bound count)))))
+    (condition-case err
+        (eval search-expr)
+      (search-failed
+       (goto-char saved-point)
+       (unless noerror
+         (error (error-message-string err)))))))
+
+
+;; --- Font Lock ---
+
+(defconst js-function-heading-1-re 
+  "^[ \t]*function[ \t]+\\(\\w+\\)"
+  "Regular expression matching the start of a function header.")
+
+(defconst js-function-heading-2-re 
+  "^[ \t]*\\(\\w+\\)[ \t]*:[ \t]*function\\>"
+  "Regular expression matching the start of a function entry in
+  an associative array.")
+
+(defconst js-keyword-re
+  (regexp-opt '("abstract" "break" "case" "catch" "class" "const"
+                "continue" "debugger" "default" "delete" "do" "else" 
+                "enum" "export" "extends" "final" "finally" "for" 
+                "function" "goto" "if" "implements" "import" "in" 
+                "instanceof" "interface" "native" "new" "package" 
+                "private" "protected" "public" "return" "static" 
+                "super" "switch" "synchronized" "this" "throw" 
+                "throws" "transient" "try" "typeof" "var" "void" 
+                "volatile" "while" "with") 'words)
+  "Regular expression matching any JavaScript keyword.")
+
+(defconst js-basic-type-re
+  (regexp-opt '("boolean" "byte" "char" "double" "float" "int" "long"
+                "short" "void") 'words)
+  "Regular expression matching any predefined type in JavaScript.")
+
+(defconst js-constant-re
+  (regexp-opt '("false" "null" "true") 'words)
+  "Regular expression matching any future reserved words in JavaScript.")
+
+
+(defconst js-font-lock-keywords-1
+  (list 
+   "\\<import\\>" 
+   (list js-function-heading-1-re 1 font-lock-function-name-face)
+   (list js-function-heading-2-re 1 font-lock-function-name-face)
+   (list "[[:punct:]][[:blank:]]*\\(/.*?/\\w*\\)" 1 font-lock-string-face))
+  "Level one font lock.")
+
+(defconst js-font-lock-keywords-2
+  (append js-font-lock-keywords-1
+          (list (list js-keyword-re 1 font-lock-keyword-face)
+                (cons js-basic-type-re font-lock-type-face)
+                (cons js-constant-re font-lock-constant-face)))
+  "Level two font lock.")
+
+(defconst js-font-lock-keywords-3
+  (append js-font-lock-keywords-2
+          (list 
+           (list
+            (concat "\\<\\(const\\|var\\)\\>\\|" js-basic-type-re "\\|" 
+                    js-function-heading-1-re "\\|" js-function-heading-2-re)
+            (list "\\(\\w+\\)[ \t]*\\(,\\|=[ \t]*\\(\".*?\"\\|'.*?'\\|{.*?}\\|.*?,\\)\\|.*\\)"
+                  nil
+                  nil
+                  '(1 font-lock-variable-name-face)))))
+  "Level three font lock.")
+
+(defconst js-font-lock-keywords
+  '(js-font-lock-keywords-3 js-font-lock-keywords-1 js-font-lock-keywords-2
+                            js-font-lock-keywords-3)
+  "See `font-lock-keywords'.")
+
+
+;; --- Indentation ---
+
+(defconst js-possibly-braceless-keyword-re
+  (regexp-opt
+   '("catch" "do" "else" "finally" "for" "if" "try" "while" "with")
+   'words)
+  "Regular expression matching keywords that are optionally
+  followed by an opening brace.")
+
+(defconst js-indent-operator-re
+  (concat "[-+*/%<>=&^|?:]\\([^-+*/]\\|$\\)\\|"
+          (regexp-opt '("in" "instanceof") 'words))
+  "Regular expression matching operators that affect indentation
+  of continued expressions.")
+
+
+(defun js-looking-at-operator-p ()
+  "Return non-nil if text after point is an operator (that is not
+a comma)."
+  (save-match-data
+    (and (looking-at js-indent-operator-re)
+         (or (not (looking-at ":"))
+             (save-excursion
+               (and (js-re-search-backward "[?:{]\\|\\<case\\>" nil t)
+                    (looking-at "?")))))))
+
+
+(defun js-continued-expression-p ()
+  "Returns non-nil if the current line continues an expression."
+  (save-excursion
+    (back-to-indentation)
+    (or (js-looking-at-operator-p)
+        (and (js-re-search-backward "\n" nil t)
+	     (progn 
+	       (skip-chars-backward " \t")
+	       (backward-char)
+	       (and (> (point) (point-min))
+                    (save-excursion (backward-char) (not (looking-at "[/*]/")))
+                    (js-looking-at-operator-p)
+		    (and (progn (backward-char)
+				(not (looking-at "++\\|--\\|/[/*]"))))))))))
+
+
+(defun js-end-of-do-while-loop-p ()
+  "Returns non-nil if word after point is `while' of a do-while
+statement, else returns nil. A braceless do-while statement
+spanning several lines requires that the start of the loop is
+indented to the same column as the current line."
+  (interactive)
+  (save-excursion
+    (save-match-data
+      (when (looking-at "\\s-*\\<while\\>")
+	(if (save-excursion 
+	      (skip-chars-backward "[ \t\n]*}")
+	      (looking-at "[ \t\n]*}"))
+	    (save-excursion 
+	      (backward-list) (backward-word 1) (looking-at "\\<do\\>"))
+	  (js-re-search-backward "\\<do\\>" (point-at-bol) t)
+	  (or (looking-at "\\<do\\>")
+	      (let ((saved-indent (current-indentation)))
+		(while (and (js-re-search-backward "^[ \t]*\\<" nil t)
+			    (/= (current-indentation) saved-indent)))
+		(and (looking-at "[ \t]*\\<do\\>")
+		     (not (js-re-search-forward 
+			   "\\<while\\>" (point-at-eol) t))
+		     (= (current-indentation) saved-indent)))))))))
+
+
+(defun js-ctrl-statement-indentation ()
+  "Returns the proper indentation of the current line if it
+starts the body of a control statement without braces, else
+returns nil."
+  (save-excursion
+    (back-to-indentation)
+    (when (save-excursion
+            (and (> (count-lines (point-min) (point)) 1)
+                 (not (looking-at "[{}]"))
+                 (js-re-search-backward "[[:graph:]]" nil t)
+                 (not (looking-at "[{([]"))
+                 (progn
+                   (forward-char) 
+                   (backward-sexp)
+                   (when (looking-at "(") (backward-word 1))
+                   (and (save-excursion
+                          (skip-chars-backward " \t}" (point-at-bol))
+                          (bolp))
+                        (looking-at js-possibly-braceless-keyword-re)
+                        (not (js-end-of-do-while-loop-p))))))
+      (save-excursion
+        (goto-char (match-beginning 0))
+        (+ (current-indentation) javascript-indent-level)))))
+
+
+(defun js-proper-indentation (parse-status)
+  "Return the proper indentation for the current line."
+  (save-excursion
+    (back-to-indentation)
+    (let ((ctrl-stmt-indent (js-ctrl-statement-indentation))
+          (same-indent-p (looking-at "[]})]\\|\\<case\\>\\|\\<default\\>"))
+          (continued-expr-p (js-continued-expression-p)))
+      (cond (ctrl-stmt-indent)
+            ((nth 1 parse-status)
+             (goto-char (nth 1 parse-status))
+             (if (looking-at "[({[][ \t]*\\(/[/*]\\|$\\)")
+                 (let ((p (parse-partial-sexp (point-at-bol) (point))))
+                   (when (save-excursion (skip-chars-backward " \t)")
+                                         (looking-at ")"))
+                     (backward-list))
+                   (if (nth 1 p)
+                       (progn (goto-char (1+ (nth 1 p)))
+                              (skip-chars-forward " \t"))
+                     (back-to-indentation))
+                   (cond (same-indent-p
+                          (current-column))
+                         (continued-expr-p
+                          (+ (current-column) (* 2 javascript-indent-level)))
+                         (t
+                          (+ (current-column) javascript-indent-level))))
+               (unless same-indent-p
+                 (forward-char)
+                 (skip-chars-forward " \t"))
+               (current-column)))
+	    (continued-expr-p javascript-indent-level)
+            (t 0)))))
+
+
+(defun javascript-indent-line ()
+  "Indent the current line as JavaScript source text."
+  (interactive)
+  (let ((parse-status 
+         (save-excursion (parse-partial-sexp (point-min) (point-at-bol))))
+        (offset (- (current-column) (current-indentation))))
+    (when (not (nth 8 parse-status))
+      (indent-line-to (js-proper-indentation parse-status))
+      (when (> offset 0) (forward-char offset)))))
+
+
+;; --- Filling ---
+
+;; FIXME: It should be possible to use the more sofisticated function
+;; `c-fill-paragraph' in `cc-cmds.el' instead. However, just setting
+;; `fill-paragraph-function' to `c-fill-paragraph' does not work;
+;; inside `c-fill-paragraph', `fill-paragraph-function' evaluates to
+;; nil!?
+
+(defun js-backward-paragraph ()
+  "Move backward to start of paragraph. Postcondition: Point is at
+beginning of buffer or the previous line contains only whitespace."
+  (forward-line -1)
+  (while (not (or (bobp) (looking-at "^[ \t]*$")))
+    (forward-line -1))
+  (when (not (bobp)) (forward-line 1)))
+
+
+(defun js-forward-paragraph ()
+  "Move forward to end of paragraph. Postcondition: Point is at
+end of buffer or the next line contains only whitespace."
+  (forward-line 1)
+  (while (not (or (eobp) (looking-at "^[ \t]*$")))
+    (forward-line 1))
+  (when (not (eobp)) (backward-char 1)))
+ 
+
+(defun js-fill-block-comment-paragraph (parse-status justify)
+  "Fill current paragraph as a block comment. PARSE-STATUS is the
+result of `parse-partial-regexp' from beginning of buffer to
+point. JUSTIFY has the same meaning as in `fill-paragraph'."
+  (let ((offset (save-excursion 
+                  (goto-char (nth 8 parse-status)) (current-indentation))))
+    (save-excursion
+      (save-restriction
+        (narrow-to-region (save-excursion 
+                            (goto-char (nth 8 parse-status)) (point-at-bol))
+                          (save-excursion 
+			    (goto-char (nth 8 parse-status))
+			    (re-search-forward "*/")))
+        (narrow-to-region (save-excursion 
+                            (js-backward-paragraph)
+                            (when (looking-at "^[ \t]*$") (forward-line 1))
+                            (point))
+                          (save-excursion 
+                            (js-forward-paragraph) 
+                            (when (looking-at "^[ \t]*$") (backward-char))
+                            (point)))
+        (goto-char (point-min))
+        (while (not (eobp))
+          (delete-horizontal-space)
+          (forward-line 1))
+        (let ((fill-column (- fill-column offset))
+              (fill-paragraph-function nil))
+          (fill-paragraph justify))
+
+        ;; In Emacs 21.4 as opposed to CVS Emacs 22,
+        ;; `fill-paragraph' seems toadd a newline at the end of the
+        ;; paragraph. Remove it!
+        (goto-char (point-max))
+        (when (looking-at "^$") (backward-delete-char 1))
+
+        (goto-char (point-min))
+        (while (not (eobp))
+          (indent-to offset)
+          (forward-line 1))))))
+
+
+(defun js-sline-comment-par-start ()
+  "Return point at the beginning of the line where the current
+single-line comment paragraph starts."
+  (save-excursion
+    (beginning-of-line)
+    (while (and (not (bobp)) 
+                (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
+      (forward-line -1))
+    (unless (bobp) (forward-line 1))
+    (point)))
+
+
+(defun js-sline-comment-par-end ()
+  "Return point at end of current single-line comment paragraph."
+  (save-excursion
+    (beginning-of-line)
+    (while (and (not (eobp)) 
+                (looking-at "^[ \t]*//[ \t]*[[:graph:]]"))
+      (forward-line 1))
+    (unless (bobp) (backward-char))
+    (point)))
+
+
+(defun js-sline-comment-offset (line)
+  "Return the column at the start of the current single-line
+comment paragraph."
+  (save-excursion 
+    (goto-line line)
+    (re-search-forward "//" (point-at-eol))
+    (goto-char (match-beginning 0))
+    (current-column)))
+
+
+(defun js-sline-comment-text-offset (line)
+  "Return the column at the start of the text of the current
+single-line comment paragraph."
+  (save-excursion
+    (goto-line line)
+    (re-search-forward "//[ \t]*" (point-at-eol))
+    (current-column)))
+
+
+(defun js-at-empty-sline-comment-p ()
+  "Return non-nil if inside an empty single-line comment."
+  (and (save-excursion
+         (beginning-of-line)
+         (not (looking-at "^.*//.*[[:graph:]]")))
+       (save-excursion
+         (re-search-backward "//" (point-at-bol) t))))
+
+         
+(defun js-fill-sline-comments (parse-status justify)
+  "Fill current paragraph as a sequence of single-line comments.
+PARSE-STATUS is the result of `parse-partial-regexp' from
+beginning of buffer to point. JUSTIFY has the same meaning as in
+`fill-paragraph'."
+  (when (not (js-at-empty-sline-comment-p))
+    (let* ((start (js-sline-comment-par-start))
+           (start-line (1+ (count-lines (point-min) start)))
+           (end (js-sline-comment-par-end))
+           (offset (js-sline-comment-offset start-line))
+           (text-offset (js-sline-comment-text-offset start-line)))
+      (save-excursion
+        (save-restriction
+          (narrow-to-region start end)
+          (goto-char (point-min))
+          (while (re-search-forward "^[ \t]*//[ \t]*" nil t)
+            (replace-match "")
+            (forward-line 1))
+          (let ((fill-paragraph-function nil)
+                (fill-column (- fill-column text-offset)))
+            (fill-paragraph justify))
+
+          ;; In Emacs 21.4 as opposed to CVS Emacs 22,
+          ;; `fill-paragraph' seems toadd a newline at the end of the
+          ;; paragraph. Remove it!
+          (goto-char (point-max))
+          (when (looking-at "^$") (backward-delete-char 1))
+
+          (goto-char (point-min))
+          (while (not (eobp))
+            (indent-to offset)
+            (insert "//")
+            (indent-to text-offset)
+            (forward-line 1)))))))
+  
+
+(defun js-trailing-comment-p (parse-status)
+  "Return non-nil if inside a trailing comment. PARSE-STATUS is
+the result of `parse-partial-regexp' from beginning of buffer to
+point."
+  (save-excursion 
+    (when (nth 4 parse-status)
+      (goto-char (nth 8 parse-status))
+      (skip-chars-backward " \t")
+      (not (bolp)))))
+
+
+(defun js-block-comment-p (parse-status)
+  "Return non-nil if inside a block comment. PARSE-STATUS is the
+result of `parse-partial-regexp' from beginning of buffer to
+point."
+  (save-excursion 
+    (save-match-data
+      (when (nth 4 parse-status)
+        (goto-char (nth 8 parse-status))
+        (looking-at "/\\*")))))
+
+
+(defun javascript-fill-paragraph (&optional justify)
+  "If inside a comment, fill the current comment paragraph.
+Trailing comments are ignored."
+  (interactive)
+  (let ((parse-status (parse-partial-sexp (point-min) (point))))
+    (when (and (nth 4 parse-status) 
+               (not (js-trailing-comment-p parse-status)))
+      (if (js-block-comment-p parse-status)
+          (js-fill-block-comment-paragraph parse-status justify)
+        (js-fill-sline-comments parse-status justify))))
+  t)
+
+
+;; --- Imenu ---
+
+(defconst js-imenu-generic-expression 
+  (list
+   (list
+    nil 
+    "function\\s-+\\(\\w+\\)\\s-*("
+    1))
+  "Regular expression matching top level procedures. Used by imenu.")
+
+
+;; --- Main Function ---
+
+;;;###autoload
+(defun javascript-mode ()
+  "Major mode for editing JavaScript source text.
+
+Key bindings:
+
+\\{javascript-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+
+  (use-local-map javascript-mode-map)
+  (set-syntax-table javascript-mode-syntax-table)
+  (set (make-local-variable 'indent-line-function) 'javascript-indent-line)
+  (set (make-local-variable 'font-lock-defaults) (list js-font-lock-keywords))
+
+  (set (make-local-variable 'parse-sexp-ignore-comments) t) 
+
+  ;; Comments
+  (setq comment-start "// ")
+  (setq comment-end "")
+  (set (make-local-variable 'fill-paragraph-function) 
+       'javascript-fill-paragraph)
+
+  ;; Imenu
+  (setq imenu-case-fold-search nil)
+  (set (make-local-variable 'imenu-generic-expression)
+       js-imenu-generic-expression)
+
+  (setq major-mode 'javascript-mode)
+  (setq mode-name "JavaScript")
+  (run-hooks 'javascript-mode-hook))
+
+
+(provide 'javascript-mode)
+;;; javascript.el ends here

Added: trunk/scripts/emacs/pmp-emacs.el
===================================================================
--- trunk/scripts/emacs/pmp-emacs.el	                        (rev 0)
+++ trunk/scripts/emacs/pmp-emacs.el	2006-08-10 00:19:45 UTC (rev 181)
@@ -0,0 +1,40 @@
+;; Check if we're editing a file from a pmplib svn checkout
+(defun pmplib-checksvn (file)
+  (and file
+       (file-regular-p file)
+       (let ((entries (concat (file-name-directory file)
+			      ".svn/entries")))
+	 (when (file-regular-p entries)
+	   (with-temp-buffer
+	     ;; We can probably find the repo url in the first 300 chars
+	     (insert-file-contents entries t)
+	     (search-forward "<entry" nil nil)
+	     (search-forward "<entry" nil nil)
+	     (search-backward "sourceforge.net/svnroot/pmplib" nil nil))))))
+
+;; Tabs are evil.
+(defface pmp-tab-face
+   '((t (:background "#fafaff")))
+   "Used for tabs.")
+
+(defun maybe-pmplib-style ()
+    (when (pmplib-checksvn buffer-file-name)
+      ;; Huh, what style *are* we using? :)
+      (c-set-style "linux")
+      (font-lock-add-keywords nil
+			      '(("\t" . 'pmp-tab-face)))
+      (setq c-basic-offset 4
+	    tab-width 4
+	    indent-tabs-mode t)))
+
+(add-hook 'c-mode-hook 'maybe-pmplib-style)
+;;(add-hook 'c-mode-hook
+;;  (lambda ()
+;;    (font-lock-add-keywords 
+;;       nil '(("\t" . 'pmp-tab-face)))))
+
+;; JSPL editing
+(autoload 'javascript-mode "javascript" nil t)
+(add-to-list 'auto-mode-alist '("\\.js\\(pl?\\)\\'" . javascript-mode))
+
+(provide 'pmp-emacs)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [378] trunk

[<suc...@us...>]

Revision: 378
          http://svn.sourceforge.net/pmplib/?rev=378&view=rev
Author:   sucknblow
Date:     2007-02-18 10:42:22 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
KDEmail mail server seems to have died. New address

Modified Paths:
--------------
    trunk/pmplib/AUTHORS
    trunk/pmplib/README
    trunk/pmplib/debian/changelog
    trunk/pmplib/debian/compat
    trunk/pmplib/debian/control
    trunk/pmplib/debian/copyright
    trunk/pmplib/debian/rules
    trunk/pmplib/frontend/easypmp/cui/console_posix.c
    trunk/pmplib/frontend/easypmp/cui/easypmp.1
    trunk/pmplib/lib/filepath/filepath_posix.c
    trunk/pmplib/lib/filepath/rel2abs.c
    trunk/pmplib/lib/filepath/rel2abs.h
    trunk/webpage/about.xml

Modified: trunk/pmplib/AUTHORS
===================================================================
--- trunk/pmplib/AUTHORS	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/AUTHORS	2007-02-18 18:42:22 UTC (rev 378)
@@ -1,2 +1,2 @@
 Naoaki Okazaki <nyaochi at users sourceforge net>
-Martin Ellis <mar...@kd...>
+Martin Ellis <ma...@do...>

Modified: trunk/pmplib/README
===================================================================
--- trunk/pmplib/README	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/README	2007-02-18 18:42:22 UTC (rev 378)
@@ -17,7 +17,7 @@
 The following text applies to the programs and the pmp and gmi
 libraries.
     Copyright (c) 2005-2007 Naoaki Okazaki <nyaochi at users.sourceforge.net>
-    Copyright (c) 2006 Martin Ellis <mar...@kd...>
+    Copyright (c) 2006 Martin Ellis <ma...@do...>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -39,7 +39,7 @@
 lib/ucs2, lib/filepath, and lib/playlist directories.
 
     Copyright (c) 2005-2007 Naoaki Okazaki <nyaochi at users.sourceforge.net>
-    Copyright (c) 2006 Martin Ellis <mar...@kd...>
+    Copyright (c) 2006 Martin Ellis <ma...@do...>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public License

Modified: trunk/pmplib/debian/changelog
===================================================================
--- trunk/pmplib/debian/changelog	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/debian/changelog	2007-02-18 18:42:22 UTC (rev 378)
@@ -2,4 +2,4 @@
 
   * Initial release Closes: #369975
 
- -- Martin Ellis <mar...@kd...>  Sat, 29 Jul 2006 23:05:36 +0100
+ -- Martin Ellis <ma...@do...>  Sat, 29 Jul 2006 23:05:36 +0100

Modified: trunk/pmplib/debian/compat
===================================================================
--- trunk/pmplib/debian/compat	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/debian/compat	2007-02-18 18:42:22 UTC (rev 378)
@@ -1 +1 @@
-4
+5

Modified: trunk/pmplib/debian/control
===================================================================
--- trunk/pmplib/debian/control	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/debian/control	2007-02-18 18:42:22 UTC (rev 378)
@@ -1,8 +1,8 @@
 Source: pmplib
 Section: sound
 Priority: extra
-Maintainer: Martin Ellis <mar...@kd...>
-Build-Depends: debhelper (>= 4.0.0), libvorbis-dev, libid3tag0-dev, libmozjs-dev
+Maintainer: Martin Ellis <ma...@do...>
+Build-Depends: debhelper (>= 5), libvorbis-dev, libid3tag0-dev, libmozjs-dev
 Standards-Version: 3.7.2
 
 Package: easypmp
@@ -47,7 +47,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Description: library for creating playlists for portable media players
+Description: library for creating databases and playlists for portable media players
  PMPlib is a library for creating and maintaining the music database and
  playlists for a variety of portable music players.
  .

Modified: trunk/pmplib/debian/copyright
===================================================================
--- trunk/pmplib/debian/copyright	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/debian/copyright	2007-02-18 18:42:22 UTC (rev 378)
@@ -1,4 +1,4 @@
-This package was debianized by Martin Ellis <mar...@kd...> on
+This package was debianized by Martin Ellis <ma...@do...> on
 Fri,  2 Jun 2006 18:43:00 +0100.
 
 It was downloaded from http://pmplib.sourceforge.net/
@@ -21,7 +21,7 @@
 The following text applies to the programs and the pmp and gmi
 libraries.
     Copyright (c) 2005-2006 Nyaochi <ny...@ny...>
-    Copyright (c) 2006 Martin Ellis <mar...@kd...>
+    Copyright (c) 2006 Martin Ellis <ma...@do...>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -46,7 +46,7 @@
 lib/ucs2, lib/filepath, and lib/playlist directories.
 
     Copyright (c) 2005-2006 Nyaochi <ny...@ny...>
-    Copyright (c) 2006 Martin Ellis <mar...@kd...>
+    Copyright (c) 2006 Martin Ellis <ma...@do...>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public License
@@ -71,7 +71,7 @@
 
 Copyright (c) 1997 Shigio Yamaguchi. All rights reserved.
 Copyright (c) 1999 Tama Communications Corporation. All rights reserved.
-Copyright (c) 2006 Martin Ellis <mar...@kd...>.
+Copyright (c) 2006 Martin Ellis <ma...@do...>.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -97,5 +97,5 @@
 
 
 The Debian packaging is
-    Copyright (c) 2006-2007 Martin Ellis <mar...@kd...>
+    Copyright (c) 2006-2007 Martin Ellis <ma...@do...>
 and is licensed under the GPL, see above.

Modified: trunk/pmplib/debian/rules
===================================================================
--- trunk/pmplib/debian/rules	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/debian/rules	2007-02-18 18:42:22 UTC (rev 378)
@@ -35,7 +35,6 @@
 build-stamp:  config.status
 	dh_testdir
 	$(MAKE)
-	#docbook-to-man debian/easypmp.sgml > easypmp.1
 	touch build-stamp
 
 clean:
@@ -43,7 +42,6 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -51,9 +49,9 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-
 	dh_clean 
 
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -61,7 +59,6 @@
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

Modified: trunk/pmplib/frontend/easypmp/cui/console_posix.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/console_posix.c	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/frontend/easypmp/cui/console_posix.c	2007-02-18 18:42:22 UTC (rev 378)
@@ -1,7 +1,7 @@
 /*
  *      Miscellaneous utilities.
  *
- *      Copyright (c) 2006 Martin Ellis <mar...@kd...>
+ *      Copyright (c) 2006 Martin Ellis <ma...@do...>
  *      Copyright (c) 2006-2007 Naoaki Okazaki
  *
  * This program is free software; you can redistribute it and/or modify

Modified: trunk/pmplib/frontend/easypmp/cui/easypmp.1
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/easypmp.1	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/frontend/easypmp/cui/easypmp.1	2007-02-18 18:42:22 UTC (rev 378)
@@ -290,5 +290,5 @@
 who also wrote an initial POSIX port using the Cygwin environment.
 
 This manual page was written by Martin Ellis
-<mar...@kd...>,
+<ma...@do...>,
 who also contributed bug fixes for the POSIX port.

Modified: trunk/pmplib/lib/filepath/filepath_posix.c
===================================================================
--- trunk/pmplib/lib/filepath/filepath_posix.c	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/lib/filepath/filepath_posix.c	2007-02-18 18:42:22 UTC (rev 378)
@@ -2,7 +2,7 @@
  *      File/path utility implemented with POSIX API.
  *
  *      Copyright (c) 2005-2007 Naoaki Okazaki
- *      Copyright (c) 2006-2007 Martin Ellis <mar...@kd...>
+ *      Copyright (c) 2006-2007 Martin Ellis <ma...@do...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: trunk/pmplib/lib/filepath/rel2abs.c
===================================================================
--- trunk/pmplib/lib/filepath/rel2abs.c	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/lib/filepath/rel2abs.c	2007-02-18 18:42:22 UTC (rev 378)
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1997 Shigio Yamaguchi. All rights reserved.
  * Copyright (c) 1999 Tama Communications Corporation. All rights reserved.
- * Copyright (c) 2006 Martin Ellis <mar...@kd...>.
+ * Copyright (c) 2006 Martin Ellis <ma...@do...>.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/pmplib/lib/filepath/rel2abs.h
===================================================================
--- trunk/pmplib/lib/filepath/rel2abs.h	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/pmplib/lib/filepath/rel2abs.h	2007-02-18 18:42:22 UTC (rev 378)
@@ -1,7 +1,7 @@
 /*
  *      Relative to absolute path name conversion function (signature).
  *
- *      Copyright (c) 2006 Martin Ellis <mar...@kd...>
+ *      Copyright (c) 2006 Martin Ellis <ma...@do...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: trunk/webpage/about.xml
===================================================================
--- trunk/webpage/about.xml	2007-02-18 08:04:37 UTC (rev 377)
+++ trunk/webpage/about.xml	2007-02-18 18:42:22 UTC (rev 378)
@@ -36,7 +36,7 @@
 <dt>Martin Ellis</dt>
 <dd>
 Project admin and core developer. Owns an iriver U10 [1GB].<br/>
-<img src="http://martin.ellis.name/img/martin.ellis.kdemail.net.png" />
+<img src="http://martin.ellis.name/img/ma...@do...g" />
 </dd>
 
 </dl>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.