c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed windows path determination (patch from Roland Schwarz, bug #462877)

Browse Source 
* xmlIO.c: fixed windows path determination (patch from
  Roland Schwarz, bug #462877)
* win32/Makefile.mingw win32/configure.js: fixed mingw build
  (patch from Roland Schwarz, bug #462877)

svn path=/trunk/; revision=3648
This commit is contained in:
Rob Richards 2007-08-14 09:41:21 +00:00
parent da62934715
commit f779da3172
4 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Aug 14 11:42:27 CEST 2007 Rob Richards <rrichards@ctindustries.net>
* xmlIO.c: fixed windows path determination (patch from
Roland Schwarz, bug #462877)
* win32/Makefile.mingw win32/configure.js: fixed mingw build
(patch from Roland Schwarz, bug #462877)
Wed Aug 1 09:50:12 CEST 2007 Daniel Veillard <daniel@veillard.com> Wed Aug 1 09:50:12 CEST 2007 Daniel Veillard <daniel@veillard.com>
* parser.c: fixed a parser bug where invalid char in comment may * parser.c: fixed a parser bug where invalid char in comment may

34
win32/Makefile.mingw
View File

@ -237,33 +237,33 @@ libxmla : $(BINDIR)/$(XML_A)
utils : $(UTILS) utils : $(UTILS)
clean : clean :
cmd.exe /C if exist $(XML_INTDIR) rmdir /S /Q $(XML_INTDIR) cmd.exe /C "if exist $(XML_INTDIR) rmdir /S /Q $(XML_INTDIR)"
cmd.exe /C if exist $(XML_INTDIR_A) rmdir /S /Q $(XML_INTDIR_A) cmd.exe /C "if exist $(XML_INTDIR_A) rmdir /S /Q $(XML_INTDIR_A)"
cmd.exe /C if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR) cmd.exe /C "if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR)"
cmd.exe /C if exist $(BINDIR) rmdir /S /Q $(BINDIR) cmd.exe /C "if exist $(BINDIR) rmdir /S /Q $(BINDIR)"
cmd.exe /C if exist depends.mingw del depends.mingw cmd.exe /C "if exist depends.mingw del depends.mingw"
distclean : clean distclean : clean
cmd.exe /C if exist config.* del config.* cmd.exe /C "if exist config.* del config.*"
cmd.exe /C if exist Makefile del Makefile cmd.exe /C "if exist Makefile del Makefile"
rebuild : clean all rebuild : clean all
install-libs : all install-libs : all
cmd.exe /C if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml cmd.exe /C "if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml"
cmd.exe /C if not exist $(BINPREFIX) mkdir $(BINPREFIX) cmd.exe /C "if not exist $(BINPREFIX) mkdir $(BINPREFIX)"
cmd.exe /C if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) cmd.exe /C "if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)"
cmd.exe /C copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml cmd.exe /C "copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml"
cmd.exe /C copy $(BINDIR)\$(XML_SO) $(SOPREFIX) cmd.exe /C "copy $(BINDIR)\$(XML_SO) $(SOPREFIX)"
cmd.exe /C copy $(BINDIR)\$(XML_A) $(LIBPREFIX) cmd.exe /C "copy $(BINDIR)\$(XML_A) $(LIBPREFIX)"
cmd.exe /C copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX) cmd.exe /C "copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)"
cmd.exe /C copy $(BINDIR)\xml*.exe $(BINPREFIX) cmd.exe /C "copy $(BINDIR)\xml*.exe $(BINPREFIX)"
install : install-libs install : install-libs
cmd.exe /C copy $(BINDIR)\*.exe $(BINPREFIX) cmd.exe /C "copy $(BINDIR)\*.exe $(BINPREFIX)"
install-dist : install-libs install-dist : install-libs
cmd.exe /C copy $(BINDIR)\xml*.exe $(BINPREFIX) cmd.exe /C "copy $(BINDIR)\xml*.exe $(BINPREFIX)"
# This is a target for me, to make a binary distribution. Not for the public use, # This is a target for me, to make a binary distribution. Not for the public use,
# keep your hands off :-) # keep your hands off :-)

2
win32/configure.js
View File

@ -565,8 +565,6 @@ if (cruntime == "/MT" || cruntime == "/MTd" ||
} }
dirSep = "\\"; dirSep = "\\";
if (compiler == "mingw")
dirSep = "/";
if (buildBinPrefix == "") if (buildBinPrefix == "")
buildBinPrefix = "$(PREFIX)" + dirSep + "bin"; buildBinPrefix = "$(PREFIX)" + dirSep + "bin";
if (buildIncPrefix == "") if (buildIncPrefix == "")

11
xmlIO.c
View File

@ -3493,7 +3493,6 @@ xmlParserGetDirectory(const char *filename) {
char *ret = NULL; char *ret = NULL;
char dir[1024]; char dir[1024];
char *cur; char *cur;
char sep = '/';
#ifdef _WIN32_WCE /* easy way by now ... wince does not have dirs! */ #ifdef _WIN32_WCE /* easy way by now ... wince does not have dirs! */
return NULL; return NULL;
@ -3503,18 +3502,21 @@ xmlParserGetDirectory(const char *filename) {
xmlRegisterDefaultInputCallbacks(); xmlRegisterDefaultInputCallbacks();
if (filename == NULL) return(NULL); if (filename == NULL) return(NULL);
#if defined(WIN32) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__CYGWIN__)
sep = '\\'; # define IS_XMLPGD_SEP(ch) ((ch=='/')||(ch=='\\'))
#else
# define IS_XMLPGD_SEP(ch) (ch=='/')
#endif #endif
strncpy(dir, filename, 1023); strncpy(dir, filename, 1023);
dir[1023] = 0; dir[1023] = 0;
cur = &dir[strlen(dir)]; cur = &dir[strlen(dir)];
while (cur > dir) { while (cur > dir) {
if (*cur == sep) break; if (IS_XMLPGD_SEP(*cur)) break;
cur --; cur --;
} }
if (*cur == sep) { if (IS_XMLPGD_SEP(*cur)) {
if (cur == dir) dir[1] = 0; if (cur == dir) dir[1] = 0;
else *cur = 0; else *cur = 0;
ret = xmlMemStrdup(dir); ret = xmlMemStrdup(dir);
@ -3525,6 +3527,7 @@ xmlParserGetDirectory(const char *filename) {
} }
} }
return(ret); return(ret);
#undef IS_XMLPGD_SEP
} }
/**************************************************************** /****************************************************************