? scptools/b.log Index: scptools/source/linker/scpzip.cxx =================================================================== RCS file: /cvs/installation/scptools/source/linker/scpzip.cxx,v retrieving revision 1.41 diff -u -r1.41 scpzip.cxx --- scptools/source/linker/scpzip.cxx 24 Apr 2003 15:17:46 -0000 1.41 +++ scptools/source/linker/scpzip.cxx 16 May 2003 09:37:41 -0000 @@ -234,7 +234,13 @@ pArgs[0] = ::rtl::OUString::createFromAscii( "-j" ); pArgs[1] = ::rtl::OUString::createFromAscii( aCompressionParam.GetBuffer() ); - pArgs[2] = ::rtl::OUString::createFromAscii( aDestination.GetFull().GetBuffer() ); + // Workaround for a bug in cygwin zip. Cygwins zip strippes the directories + // with the -j flag only when "/" are used, not when using "\". + // The InfoZip native W32 zip version 2.3 works with "\" and "/" + ByteString aTMPDestination( aDestination.GetFull() ); + while( aTMPDestination.SearchAndReplace('\\', '/') != STRING_NOTFOUND ); + pArgs[2] = ::rtl::OUString::createFromAscii( aTMPDestination.GetBuffer() ); + while( aSource.SearchAndReplace('\\', '/') != STRING_NOTFOUND ); pArgs[3] = ::rtl::OUString::createFromAscii( aSource.GetBuffer() ); NAMESPACE_VOS(OArgumentList) aArgs( pArgs, 4 );