incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1220726 [3/6] - in /incubator/ooo/branches/alg/svgreplacement: ./ ext_sources/ main/ main/beanshell/ main/berkeleydb/ main/bridges/source/cpp_uno/cc50_solaris_intel/ main/bridges/source/cpp_uno/cc50_solaris_sparc/ main/bridges/source/cpp_u...
Date Mon, 19 Dec 2011 13:03:57 GMT
Modified: incubator/ooo/branches/alg/svgreplacement/main/idlc/source/idlccompile.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/idlc/source/idlccompile.cxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/idlc/source/idlccompile.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/idlc/source/idlccompile.cxx Mon Dec 19 13:03:54 2011
@@ -35,7 +35,7 @@
 #include <io.h>
 #endif
 
-#ifdef	SAL_UNX
+#ifdef  SAL_UNX
 #include <unistd.h>
 #if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD)
 #include <sys/wait.h>
@@ -125,23 +125,23 @@ OString convertToFileUrl(const OString& 
 
 OString makeTempName(const OString& prefix)
 {
-	OUString uTmpPath;
-	OString tmpPath;
+    OUString uTmpPath;
+    OString tmpPath;
 
-	if ( osl_getEnvironment(TMP.pData, &uTmpPath.pData) != osl_Process_E_None )
-	{
-		if ( osl_getEnvironment(TEMP.pData, &uTmpPath.pData) != osl_Process_E_None )
-		{
+    if ( osl_getEnvironment(TMP.pData, &uTmpPath.pData) != osl_Process_E_None )
+    {
+        if ( osl_getEnvironment(TEMP.pData, &uTmpPath.pData) != osl_Process_E_None )
+        {
 #if defined(SAL_W32)
-			tmpPath = OString("c:\\temp");
+            tmpPath = OString("c:\\temp");
 #else
-			tmpPath = OString("/tmp");
+            tmpPath = OString("/tmp");
 #endif
-		}
-	}
+        }
+    }
 
-	if ( uTmpPath.getLength() )
-		tmpPath = OUStringToOString(uTmpPath, RTL_TEXTENCODING_UTF8);
+    if ( uTmpPath.getLength() )
+        tmpPath = OUStringToOString(uTmpPath, RTL_TEXTENCODING_UTF8);
 
 #if defined(SAL_W32) || defined(SAL_UNX) || defined(SAL_OS2)
 
@@ -159,43 +159,41 @@ OString makeTempName(const OString& pref
     strncat(tmpFilePattern, "XXXXXX", sizeof(tmpFilePattern)-1-strlen(tmpFilePattern));
 
 #ifdef SAL_UNX
-	int nDescriptor = mkstemp(tmpFilePattern);
-	if( -1 == nDescriptor )
-	{
-	    fprintf( stderr,"idlc: couldn't create temporary file\n" );
-	    exit( 1 );
-	}
-	// the file shall later be reopened by stdio functions
-	close( nDescriptor );
+    int nDescriptor = mkstemp(tmpFilePattern);
+    if( -1 == nDescriptor )
+    {
+        fprintf( stderr,"idlc: couldn't create temporary file %s\n", tmpFilePattern );
+        exit( 1 );
+    }
+    // the file shall later be reopened by stdio functions
+    close( nDescriptor );
 #else
-	(void) mktemp(tmpFilePattern);
+    (void) mktemp(tmpFilePattern);
 #endif
 #endif
 
-	return OString(tmpFilePattern);
+    return OString(tmpFilePattern);
 }
 
 sal_Bool copyFile(const OString* source, const OString& target)
 {
     sal_Bool bRet = sal_True;
 
-	FILE* pSource = source == 0 ? stdin : fopen(source->getStr(), "rb");
-
-	if ( !pSource )
+    FILE* pSource = source == 0 ? stdin : fopen(source->getStr(), "rb");
+    if ( !pSource )
         return sal_False;
 
-	FILE* pTarget = fopen(target.getStr(), "wb");
-
-	if ( !pTarget )
+    FILE* pTarget = fopen(target.getStr(), "wb");
+    if ( !pTarget )
     {
         fclose(pSource);
         return sal_False;
     }
-
+    
     size_t totalSize = 512;
     size_t readSize  = 0;
     size_t writeSize = 0;
-	char   pBuffer[513];
+    char   pBuffer[513];
 
     while ( !feof(pSource) )
     {
@@ -215,7 +213,7 @@ sal_Bool copyFile(const OString* source,
     if (source != 0) {
         fclose(pSource);
     }
-	if ( fflush(pTarget) )
+    if ( fflush(pTarget) )
         bRet = sal_False;
     fclose(pTarget);
 
@@ -224,9 +222,9 @@ sal_Bool copyFile(const OString* source,
 
 sal_Int32 compileFile(const OString * pathname)
 {
-	// preprocess input file
-	OString tmpFile = makeTempName(OString("idli_"));
-	OString preprocFile = makeTempName(OString("idlf_"));
+    // preprocess input file
+    OString tmpFile = makeTempName(OString("idli_"));
+    OString preprocFile = makeTempName(OString("idlf_"));
 
     OString fileName;
     if (pathname == 0) {
@@ -235,85 +233,81 @@ sal_Int32 compileFile(const OString * pa
         fileName = *pathname;
     }
 
-	if ( !copyFile(pathname, tmpFile) )
+    if ( !copyFile(pathname, tmpFile) )
     {
-	  	fprintf(stderr, "%s: could not copy %s%s to %s\n",
+        fprintf(stderr, "%s: could not copy %s%s to %s\n",
                 idlc()->getOptions()->getProgramName().getStr(),
                 pathname == 0 ? "" : "file ", fileName.getStr(),
                 tmpFile.getStr());
-	  	exit(99);
+        exit(99);
     }
 
-	idlc()->setFileName(fileName);
-	idlc()->setMainFileName(fileName);
-	idlc()->setRealFileName(tmpFile);
-
-	OStringBuffer cppArgs(512);
-	cppArgs.append("-DIDL -Xi -Xc -+ -I.");
-	Options* pOptions = idlc()->getOptions();
+    idlc()->setFileName(fileName);
+    idlc()->setMainFileName(fileName);
+    idlc()->setRealFileName(tmpFile);
+
+    ::std::vector< ::rtl::OUString > lCppArgs;
+    lCppArgs.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("-DIDL")));
+    lCppArgs.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("-C")));
+    lCppArgs.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("-zI")));
+    lCppArgs.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("-I.")));
+    
+    OStringBuffer cppArgs(256);
+    Options* pOptions = idlc()->getOptions();
 
-	OString filePath;
-	sal_Int32 index = fileName.lastIndexOf(SEPARATOR);
+    OString filePath;
+    sal_Int32 index = fileName.lastIndexOf(SEPARATOR);
 
-	if ( index > 0)
-	{
-		filePath = fileName.copy(0, index);
+    if ( index > 0)
+    {
+        filePath = fileName.copy(0, index);
 
-		if ( filePath.getLength() )
-		{
-			cppArgs.append(" -I\"");
-			cppArgs.append(filePath);
-			cppArgs.append("\"");
+        if ( filePath.getLength() )
+        {
+            cppArgs.append("-I");
+            cppArgs.append(filePath);
+            lCppArgs.push_back(OStringToOUString(cppArgs.makeStringAndClear().replace('\\', '/'), RTL_TEXTENCODING_UTF8));
 		}
 	}
 
 	if ( pOptions->isValid("-D") )
 	{
-		cppArgs.append(" ");
-		cppArgs.append(pOptions->getOption("-D"));
+        OString dOpt = pOptions->getOption("-D");
+        OString token;
+        sal_Int32 nIndex = 0;
+        do
+        {
+            token = dOpt.getToken( 0, ' ', nIndex );
+            if (token.getLength())
+            {
+                lCppArgs.push_back(OStringToOUString(token, RTL_TEXTENCODING_UTF8));
+            }
+        } while( nIndex != -1 );        
 	}
+    
 	if ( pOptions->isValid("-I") )
 	{
-		cppArgs.append(" ");
-		cppArgs.append(pOptions->getOption("-I"));
+        OString incOpt = pOptions->getOption("-I");
+        OString token;
+        sal_Int32 nIndex = 0;
+        do
+        {
+            token = incOpt.getToken( 0, ' ', nIndex );
+            if (token.getLength())
+            {
+                lCppArgs.push_back(OStringToOUString(token, RTL_TEXTENCODING_UTF8));
+            }
+        } while( nIndex != -1 );
 	}
 
-	cppArgs.append(" \"");
-	cppArgs.append(tmpFile);
-	cppArgs.append("\" \"");
+    lCppArgs.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("-o")));
+    
 	cppArgs.append(preprocFile);
-	cppArgs.append("\"");
-
-	OString cmdFileName = makeTempName(OString("idlc_"));
-	FILE* pCmdFile = fopen(cmdFileName, "w");
-
-	if ( !pCmdFile )
-	{
-	  	fprintf(stderr, "%s: couldn't open temporary file for preprocessor commands: %s\n",
-			idlc()->getOptions()->getProgramName().getStr(), cmdFileName.getStr());
-	  	exit(99);
-	}
-#ifdef SAL_OS2_00
-      char* tok = strtok( (char*)cppArgs.getStr(), " \t\n\r");
-      while( tok) {
-         if (tok[strlen(tok)-1] == '\"') 
-            tok[strlen(tok)-1] = '\0';
-         if (*tok == '\"') 
-            memcpy( tok, tok+1, strlen(tok));
-         if (strlen(tok)>0) {
-            fputs(tok, pCmdFile);
-            fputc('\n', pCmdFile);
-         }
-         tok = strtok( NULL, " \t\n\r");
-      }
-#else
-	fprintf(pCmdFile, "%s", cppArgs.getStr());
-#endif
-	fclose(pCmdFile);
-
-	OUString cmdArg(RTL_CONSTASCII_USTRINGPARAM("@"));
-	cmdArg += OStringToOUString(cmdFileName, RTL_TEXTENCODING_UTF8);
+    lCppArgs.push_back(OStringToOUString(cppArgs.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
 
+    cppArgs.append(tmpFile);
+    lCppArgs.push_back(OStringToOUString(cppArgs.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
+ 
 	OUString cpp;
 	OUString startDir;
 	if (osl_getExecutableFile(&cpp.pData) != osl_Process_E_None) {
@@ -324,15 +318,27 @@ sal_Int32 compileFile(const OString * pa
  	cpp = cpp.copy(0, idx);
     
 #if defined(SAL_W32) || defined(SAL_OS2)
- 	cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp.exe"));
+ 	cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp.exe"));
 #else
-	cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("idlcpp"));
+	cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp"));
 #endif
 
 	oslProcess		hProcess = NULL;
 	oslProcessError	procError = osl_Process_E_None;
 
-	procError = osl_executeProcess(cpp.pData, &cmdArg.pData, 1, osl_Process_WAIT,
+    const int nCmdArgs = lCppArgs.size();
+    rtl_uString** pCmdArgs = 0;
+    pCmdArgs = (rtl_uString**)rtl_allocateZeroMemory(nCmdArgs * sizeof(rtl_uString*));
+
+    ::std::vector< ::rtl::OUString >::iterator iter = lCppArgs.begin();
+    ::std::vector< ::rtl::OUString >::iterator end = lCppArgs.end();
+    int i = 0;
+	while ( iter != end ) {
+        pCmdArgs[i++] = (*iter).pData;
+        ++iter;
+    }
+    
+	procError = osl_executeProcess(cpp.pData, pCmdArgs, nCmdArgs, osl_Process_WAIT,
 								   0, startDir.pData, 0, 0, &hProcess);
 
 	oslProcessInfo hInfo;
@@ -352,13 +358,15 @@ sal_Int32 compileFile(const OString * pa
                     pOptions->getProgramName().getStr(),
                     pathname == 0 ? "" : "file ", fileName.getStr());
 
-		unlink(tmpFile.getStr());
-		unlink(preprocFile.getStr());
-		unlink(cmdFileName.getStr());
+		// unlink(tmpFile.getStr());
+		// unlink(preprocFile.getStr());
+		// unlink(cmdFileName.getStr());
 		osl_freeProcessHandle(hProcess);
+        rtl_freeMemory(pCmdArgs);
 		exit(hInfo.Code ? hInfo.Code : 99);
 	}
 	osl_freeProcessHandle(hProcess);
+    rtl_freeMemory(pCmdArgs);
 
 	if (unlink(tmpFile.getStr()) != 0)
 	{
@@ -367,14 +375,6 @@ sal_Int32 compileFile(const OString * pa
 		exit(99);
 	}
 
-	if (unlink(cmdFileName.getStr()) != 0)
-	{
-		fprintf(stderr, "%s: Could not remove unocpp command file %s\n",
-			   	pOptions->getProgramName().getStr(), cmdFileName.getStr());
-
-		exit(99);
-	}
-
 	if ( pOptions->isValid("-E") )
 	{
 		if (unlink(preprocFile) != 0)
@@ -405,7 +405,7 @@ sal_Int32 compileFile(const OString * pa
 	fclose(yyin);
 	if (unlink(preprocFile.getStr()) != 0)
 	{
-		fprintf(stderr, "%s: Could not remove parser input file %s\n",
+        fprintf(stderr, "%s: Could not remove parser input file %s\n",
 			    pOptions->getProgramName().getStr(), preprocFile.getStr());
 		exit(99);
 	}

Modified: incubator/ooo/branches/alg/svgreplacement/main/idlc/source/options.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/idlc/source/options.cxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/idlc/source/options.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/idlc/source/options.cxx Mon Dec 19 13:03:54 2011
@@ -43,7 +43,7 @@ using rtl::OStringBuffer;
 #endif
 
 Options::Options(char const * progname)
-  : m_program(progname), m_stdin(false), m_verbose(false), m_quiet(false)
+    : m_program(progname), m_stdin(false), m_verbose(false), m_quiet(false)
 {
 }	
 
@@ -54,54 +54,54 @@ Options::~Options()
 // static
 bool Options::checkArgument (std::vector< std::string > & rArgs, char const * arg, size_t len)
 {
-  bool result = ((arg != 0) && (len > 0));
-  OSL_PRECOND(result, "idlc::Options::checkArgument(): invalid arguments");
-  if (result)
-  {
-    switch(arg[0])
+    bool result = ((arg != 0) && (len > 0));
+    OSL_PRECOND(result, "idlc::Options::checkArgument(): invalid arguments");
+    if (result)
     {
-    case '@':
-      if ((result = (len > 1)) == true)
-      {
-        // "@<cmdfile>"
-        result = Options::checkCommandFile (rArgs, &(arg[1]));
-      }
-      break;
-    case '-':
-      if ((result = (len > 1)) == true)
-      {
-        // "-<option>"
-        switch (arg[1])
+        switch(arg[0])
         {
-        case 'O':
-        case 'I':
-        case 'D':
-          {
-            // "-<option>[<param>]
-            std::string option(&(arg[0]), 2);
-            rArgs.push_back(option);
-            if (len > 2)
-            {
-              // "-<option><param>"
-              std::string param(&(arg[2]), len - 2);
-              rArgs.push_back(param);
+        case '@':
+            if ((result = (len > 1)) == true)
+            {
+                // "@<cmdfile>"
+                result = Options::checkCommandFile (rArgs, &(arg[1]));
+            }
+            break;
+        case '-':
+            if ((result = (len > 1)) == true)
+            {
+                // "-<option>"
+                switch (arg[1])
+                {
+                case 'O':
+                case 'I':
+                case 'D':
+                {
+                    // "-<option>[<param>]
+                    std::string option(&(arg[0]), 2);
+                    rArgs.push_back(option);
+                    if (len > 2)
+                    {
+                        // "-<option><param>"
+                        std::string param(&(arg[2]), len - 2);
+                        rArgs.push_back(param);
+                    }
+                    break;
+                }
+                default:
+                    // "-<option>" ([long] option, w/o param)
+                    rArgs.push_back(std::string(arg, len));
+                    break;
+                }
             }
             break;
-          }
         default:
-          // "-<option>" ([long] option, w/o param)
-          rArgs.push_back(std::string(arg, len));
-          break;
-        }
-      }
-      break;
-    default:
-      // "<param>"
-      rArgs.push_back(std::string(arg, len));
-      break;
+            // "<param>"
+            rArgs.push_back(std::string(arg, len));
+            break;
+        }
     }
-  }
-  return (result);
+    return (result);
 }
 
 // static
@@ -113,10 +113,10 @@ bool Options::checkCommandFile (std::vec
         fprintf(stderr, "ERROR: can't open command file \"%s\"\n", filename);
         return (false);
     }
-
+    
     std::string buffer;
     buffer.reserve(256);
-
+    
     bool quoted = false;
     int c = EOF;
     while ((c = fgetc(fp)) != EOF)
@@ -124,30 +124,30 @@ bool Options::checkCommandFile (std::vec
         switch(c)
         {
         case '\"':
-          quoted = !quoted;
-          break;
+            quoted = !quoted;
+            break;
         case ' ':
         case '\t':
         case '\r':
         case '\n':
-          if (!quoted)
-          {
-              if (!buffer.empty())
-              {
-                  // append current argument.
-                  if (!Options::checkArgument(rArgs, buffer.c_str(), buffer.size()))
-                  {
-                      (void) fclose(fp);
-                      return (false);
-                  }
-                  buffer.clear();
-              }
-              break;
-          }
+            if (!quoted)
+            {
+                if (!buffer.empty())
+                {
+                    // append current argument.
+                    if (!Options::checkArgument(rArgs, buffer.c_str(), buffer.size()))
+                    {
+                        (void) fclose(fp);
+                        return (false);
+                    }
+                    buffer.clear();
+                }
+                break;
+            }
         default:
-          // quoted white-space fall through
-          buffer.push_back(sal::static_int_cast<char>(c));
-          break;
+            // quoted white-space fall through
+            buffer.push_back(sal::static_int_cast<char>(c));
+            break;
         }
     }
     if (!buffer.empty())
@@ -165,175 +165,174 @@ bool Options::checkCommandFile (std::vec
 
 bool Options::badOption(char const * reason, std::string const & rArg) throw(IllegalArgument)
 {
-  OStringBuffer message;
-  if (reason != 0)
-  {
-    message.append(reason); message.append(" option '"); message.append(rArg.c_str()); message.append("'");
-    throw IllegalArgument(message.makeStringAndClear());
-  }
-  return false;
+    OStringBuffer message;
+    if (reason != 0)
+    {
+        message.append(reason); message.append(" option '"); message.append(rArg.c_str()); message.append("'");
+        throw IllegalArgument(message.makeStringAndClear());
+    }
+    return false;
 }
 
 bool Options::setOption(char const * option, std::string const & rArg)
 {
-  bool result = (0 == strcmp(option, rArg.c_str()));
-  if (result)
-    m_options[rArg.c_str()] = OString(rArg.c_str(), rArg.size());
-  return (result);
+    bool result = (0 == strcmp(option, rArg.c_str()));
+    if (result)
+        m_options[rArg.c_str()] = OString(rArg.c_str(), rArg.size());
+    return (result);
 }
 
 bool Options::initOptions(std::vector< std::string > & rArgs) throw(IllegalArgument)
 {
-  std::vector< std::string >::const_iterator first = rArgs.begin(), last = rArgs.end();
-  for (; first != last; ++first)
-  {
-    if ((*first)[0] != '-')
+    std::vector< std::string >::const_iterator first = rArgs.begin(), last = rArgs.end();
+    for (; first != last; ++first)
     {
-      OString filename((*first).c_str(), (*first).size());
-      OString tmp(filename.toAsciiLowerCase());
-      if (tmp.lastIndexOf(".idl") != (tmp.getLength() - 4))
-      {
-        throw IllegalArgument("'" + filename + "' is not a valid input file, only '*.idl' files will be accepted");
-      }
-      m_inputFiles.push_back(filename);
-      continue;
-    }
-
-    std::string const option(*first);
-    switch((*first)[1])
-    {
-    case 'O':
-      {
-        if (!((++first != last) && ((*first)[0] != '-')))
-        {
-          return badOption("invalid", option);
-        }
-        OString param((*first).c_str(), (*first).size());
-        m_options["-O"] = param;
-        break;
-      }
-    case 'I':
-      {
-        if (!((++first != last) && ((*first)[0] != '-')))
-        {
-          return badOption("invalid", option);
-        }
-        OString param((*first).c_str(), (*first).size());
-        {
-          // quote param token(s).
-          OStringBuffer buffer;
-          sal_Int32 k = 0;
-          do
-          {
-            OStringBuffer token; token.append("-I\""); token.append(param.getToken(0, ';', k)); token.append("\"");
-            if (buffer.getLength() > 0)
-              buffer.append(' ');
-            buffer.append(token);
-          } while (k != -1);
-          param = buffer.makeStringAndClear();
-        }
-        if (m_options.count("-I") > 0)
-        {
-          // append param.
-          OStringBuffer buffer(m_options["-I"]);
-          buffer.append(' '); buffer.append(param);
-          param = buffer.makeStringAndClear();
-        }
-        m_options["-I"] = param;
-        break;
-      }
-    case 'D':
-      {
-        if (!((++first != last) && ((*first)[0] != '-')))
-        {
-          return badOption("invalid", option);
-        }
-        OString param("-D"); param += OString((*first).c_str(), (*first).size());
-        if (m_options.count("-D") > 0)
-        {
-          OStringBuffer buffer(m_options["-D"]);
-          buffer.append(' '); buffer.append(param);
-          param = buffer.makeStringAndClear();
-        }
-        m_options["-D"] = param;
-        break;
-      }
-    case 'C':
-      {
-        if (!setOption("-C", option))
-        {
-          return badOption("invalid", option);
-        }
-        break;
-      }
-    case 'c':
-      {
-        if (!setOption("-cid", option))
-        {
-          return badOption("invalid", option);
-        }
-        break;
-      }
-    case 'q':
-      {
-        if (!setOption("-quiet", option))
-        {
-          return badOption("invalid", option);
-        }
-        m_quiet = true;
-        break;
-      }
-    case 'v':
-      {
-        if (!setOption("-verbose", option))
-        {
-          return badOption("invalid", option);
-        }
-        m_verbose = true;
-        break;
-      }
-    case 'w':
-      {
-        if (!(setOption("-w", option) || setOption("-we", option)))
-        {
-          return badOption("invalid", option);
-        }
-        break;
-      }
-    case 'h':
-    case '?':
-      {
-        if (!(setOption("-h", option) || setOption("-?", option)))
-        {
-          return badOption("invalid", option);
-        }
-        {
-          (void) fprintf(stdout, "%s", prepareHelp().getStr());
-          return (false);
-        }
-        // break; // Unreachable
-      }
-    case 's':
-      {
-        if (!setOption("-stdin", option))
-        {
-          return badOption("invalid", option);
-        }
-        m_stdin = true;
-        break;
-      }
-    default:
-      return badOption("unknown", option);
+        if ((*first)[0] != '-')
+        {
+            OString filename((*first).c_str(), (*first).size());
+            OString tmp(filename.toAsciiLowerCase());
+            if (tmp.lastIndexOf(".idl") != (tmp.getLength() - 4))
+            {
+                throw IllegalArgument("'" + filename + "' is not a valid input file, only '*.idl' files will be accepted");
+            }
+            m_inputFiles.push_back(filename);
+            continue;
+        }
+        
+        std::string const option(*first);
+        switch((*first)[1])
+        {
+        case 'O':
+        {
+            if (!((++first != last) && ((*first)[0] != '-')))
+            {
+                return badOption("invalid", option);
+            }
+            OString param((*first).c_str(), (*first).size());
+            m_options["-O"] = param;
+            break;
+        }
+        case 'I':
+        {
+            if (!((++first != last) && ((*first)[0] != '-')))
+            {
+                return badOption("invalid", option);
+            }
+            OString param((*first).c_str(), (*first).size());
+            {
+                // quote param token(s).
+                OStringBuffer buffer;
+                sal_Int32 k = 0;
+                do
+                {
+                    OStringBuffer token; token.append("-I"); token.append(param.getToken(0, ';', k));
+                    if (buffer.getLength() > 0)
+                        buffer.append(' ');
+                    buffer.append(token);
+                } while (k != -1);
+                param = buffer.makeStringAndClear();
+            }
+            if (m_options.count("-I") > 0)
+            {
+                // append param.
+                OStringBuffer buffer(m_options["-I"]);
+                buffer.append(' '); buffer.append(param);
+                param = buffer.makeStringAndClear();
+            }
+            m_options["-I"] = param;
+            break;
+        }
+        case 'D':
+        {
+            if (!((++first != last) && ((*first)[0] != '-')))
+            {
+                return badOption("invalid", option);
+            }
+            OString param("-D"); param += OString((*first).c_str(), (*first).size());
+            if (m_options.count("-D") > 0)
+            {
+                OStringBuffer buffer(m_options["-D"]);
+                buffer.append(' '); buffer.append(param);
+                param = buffer.makeStringAndClear();
+            }
+            m_options["-D"] = param;
+            break;
+        }
+        case 'C':
+        {
+            if (!setOption("-C", option))
+            {
+                return badOption("invalid", option);
+            }
+            break;
+        }
+        case 'c':
+        {
+            if (!setOption("-cid", option))
+            {
+                return badOption("invalid", option);
+            }
+            break;
+        }
+        case 'q':
+        {
+            if (!setOption("-quiet", option))
+            {
+                return badOption("invalid", option);
+            }
+            m_quiet = true;
+            break;
+        }
+        case 'v':
+        {
+            if (!setOption("-verbose", option))
+            {
+                return badOption("invalid", option);
+            }
+            m_verbose = true;
+            break;
+        }
+        case 'w':
+        {
+            if (!(setOption("-w", option) || setOption("-we", option)))
+            {
+                return badOption("invalid", option);
+            }
+            break;
+        }
+        case 'h':
+        case '?':
+        {
+            if (!(setOption("-h", option) || setOption("-?", option)))
+            {
+                return badOption("invalid", option);
+            }
+            {
+                (void) fprintf(stdout, "%s", prepareHelp().getStr());
+                return (false);
+            }
+            // break; // Unreachable
+        }
+        case 's':
+        {
+            if (!setOption("-stdin", option))
+            {
+                return badOption("invalid", option);
+            }
+            m_stdin = true;
+            break;
+        }
+        default:
+            return badOption("unknown", option);
+        }
     }
-  }
-  return (true);
+    return (true);
 }
 
 OString	Options::prepareHelp()
 {
 	OString help("\nusing: ");
-	help += m_program
-        + " [-options] <file_1> ... <file_n> | @<filename> | -stdin\n";
+	help += m_program + " [-options] <file_1> ... <file_n> | @<filename> | -stdin\n";
 	help += "    <file_n>    = file_n specifies one or more idl files.\n";
 	help += "                  Only files with the extension '.idl' are valid.\n";
 	help += "    @<filename> = filename specifies the name of a command file.\n";

Modified: incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/prj/build.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/prj/build.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/instsetoo_native/prj/build.lst Mon Dec 19 13:03:54 2011
@@ -1,4 +1,4 @@
-oon	instsetoo_native	::	L10N:l10n postprocess packimages testautomation ooo_custom_images NULL
+oon	instsetoo_native	::	L10N:l10n postprocess packimages testautomation NULL
 oon	instsetoo_native						usr1	-	all	oon_mkout NULL
 oon	instsetoo_native\inc_openoffice\unix	nmake	-	u	oon_unix NULL
 oon	instsetoo_native\inc_openoffice\windows\msi_languages	nmake	-	all	oon_msilang NULL

Modified: incubator/ooo/branches/alg/svgreplacement/main/l10ntools/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/l10ntools/prj/build.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/l10ntools/prj/build.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/l10ntools/prj/build.lst Mon Dec 19 13:03:54 2011
@@ -1,4 +1,4 @@
-tr	l10ntools	:	tools LIBXSLT:libxslt BERKELEYDB:berkeleydb LUCENE:lucene PYTHON:python NULL
+tr	l10ntools	:	tools LIBXSLT:libxslt LUCENE:lucene PYTHON:python NULL
 tr	l10ntools						usr1	-	all	tr_mkout NULL
 tr	l10ntools\inc					nmake	-	all	tr_inc NULL
 tr	l10ntools\scripts					nmake	-	all	tr_scripts NULL

Modified: incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/HelpCompiler.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/HelpCompiler.hxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/HelpCompiler.hxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/HelpCompiler.hxx Mon Dec 19 13:03:54 2011
@@ -33,11 +33,6 @@
 #include <sstream>
 #include <algorithm>
 #include <ctype.h>
-#ifdef SYSTEM_DB
-#include <db.h>
-#else
-#include <berkeleydb/db.h>
-#endif
 
 #include <boost/shared_ptr.hpp>
 

Modified: incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/HelpLinker.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/HelpLinker.cxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/HelpLinker.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/HelpLinker.cxx Mon Dec 19 13:03:54 2011
@@ -40,8 +40,6 @@
 
 #include <expat.h>
 
-#define DBHELP_ONLY
-
 class IndexerPreProcessor
 {
 private:
@@ -211,28 +209,6 @@ public:
         data.append(id);
     }
 
-    void dump(DB* table)
-    {
-        DataHashtable::const_iterator aEnd = _hash.end();
-        for (DataHashtable::const_iterator aIter = _hash.begin(); aIter != aEnd; ++aIter)
-        {
-            const std::string &keystr = aIter->first;
-            DBT key;
-            memset(&key, 0, sizeof(key));
-            key.data = const_cast<char*>(keystr.c_str());
-            key.size = keystr.length();
-
-            const Data &data = aIter->second;
-            std::string str = data.getString();
-            DBT value;
-            memset(&value, 0, sizeof(value));
-            value.data = const_cast<char*>(str.c_str());
-            value.size = str.length();
-
-            table->put(table, NULL, &key, &value, 0);
-        }
-    }
-
     void dump_DBHelp( const fs::path& rFileName )
     {
 #ifdef WNT     //We need _wfopen to support long file paths on Windows XP
@@ -291,21 +267,9 @@ private:
     IndexerPreProcessor* m_pIndexerPreProcessor;
     void initIndexerPreProcessor();
     void link() throw( HelpProcessingException );
-    void addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishid,
+    void addBookmark( FILE* pFile_DBHelp, std::string thishid,
         const std::string& fileB, const std::string& anchorB,
         const std::string& jarfileB, const std::string& titleB );
-#if 0
-    /**
-     * @param outputFile
-     * @param module
-     * @param lang
-     * @param hid
-     * @param helpFiles
-     * @param additionalFiles
-     */
-
-    private HelpURLStreamHandlerFactory urlHandler = null;
-#endif
 };
 
 namespace URLEncoder
@@ -331,7 +295,7 @@ namespace URLEncoder
     }
 }
 
-void HelpLinker::addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishid,
+void HelpLinker::addBookmark( FILE* pFile_DBHelp, std::string thishid,
         const std::string& fileB, const std::string& anchorB,
         const std::string& jarfileB, const std::string& titleB)
 {
@@ -340,11 +304,6 @@ void HelpLinker::addBookmark( DB* dbBase
 
     thishid = URLEncoder::encode(thishid);
 
-    DBT key;
-    memset(&key, 0, sizeof(key));
-    key.data = const_cast<char*>(thishid.c_str());
-    key.size = thishid.length();
-
     int fileLen = fileB.length();
     if (!anchorB.empty())
         fileLen += (1 + anchorB.length());
@@ -369,14 +328,6 @@ void HelpLinker::addBookmark( DB* dbBase
     for (size_t j = 0; j < titleB.length(); ++j)
         dataB[i++] = titleB[j];
 
-    DBT data;
-    memset(&data, 0, sizeof(data));
-    data.data = &dataB[0];
-    data.size = dataB.size();
-
-    if( dbBase != NULL )
-        dbBase->put(dbBase, NULL, &key, &data, 0);
-
     if( pFile_DBHelp != NULL )
     {
         std::string aValueStr( dataB.begin(), dataB.end() );
@@ -412,10 +363,6 @@ void HelpLinker::link() throw( HelpProce
         fs::create_directory(indexDirParentName);
     }
 
-#ifdef CMC_DEBUG
-    std::cerr << "will not delete tmpdir of " << indexDirParentName.native_file_string().c_str() << std::endl;
-#endif
-
     std::string mod = module;
     std::transform (mod.begin(), mod.end(), mod.begin(), tolower);
 
@@ -427,18 +374,8 @@ void HelpLinker::link() throw( HelpProce
         appl = appl.substr(1);
 
     bool bUse_ = true;
-#ifdef DBHELP_ONLY
     if( !bExtensionMode )
         bUse_ = false;
-#endif
-
-    DB* helpText(0);
-#ifndef DBHELP_ONLY
-    fs::path helpTextFileName(indexDirParentName / (mod + ".ht"));
-    db_create(&helpText,0,0);
-    helpText->open(helpText, NULL, helpTextFileName.native_file_string().c_str(), NULL, DB_BTREE,
-        DB_CREATE | DB_TRUNCATE, 0644);
-#endif
 
     fs::path helpTextFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".ht_" : ".ht")));
 #ifdef WNT
@@ -450,13 +387,6 @@ void HelpLinker::link() throw( HelpProce
     FILE* pFileHelpText_DBHelp = fopen
         ( helpTextFileName_DBHelp.native_file_string().c_str(), "wb" );
 #endif
-    DB* dbBase(0);
-#ifndef DBHELP_ONLY
-    fs::path dbBaseFileName(indexDirParentName / (mod + ".db"));
-    db_create(&dbBase,0,0);
-    dbBase->open(dbBase, NULL, dbBaseFileName.native_file_string().c_str(), NULL, DB_BTREE,
-        DB_CREATE | DB_TRUNCATE, 0644);
-#endif
 
     fs::path dbBaseFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".db_" : ".db")));
 #ifdef WNT
@@ -468,14 +398,6 @@ void HelpLinker::link() throw( HelpProce
         ( dbBaseFileName_DBHelp.native_file_string().c_str(), "wb" );
 #endif    
 
-#ifndef DBHELP_ONLY
-    DB* keyWord(0);
-    fs::path keyWordFileName(indexDirParentName / (mod + ".key"));
-    db_create(&keyWord,0,0);
-    keyWord->open(keyWord, NULL, keyWordFileName.native_file_string().c_str(), NULL, DB_BTREE,
-        DB_CREATE | DB_TRUNCATE, 0644);
-#endif
-
     fs::path keyWordFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".key_" : ".key")));
 
     HelpKeyword helpKeyword;
@@ -568,23 +490,12 @@ void HelpLinker::link() throw( HelpProce
         if (documentTitle.empty())
             documentTitle = "<notitle>";
 
-#if 0
-        std::cout << "for " << xhpFileName << " documentBaseId is " << documentBaseId << "\n";
-        std::cout << "for " << xhpFileName << " documentPath is " << documentPath << "\n";
-        std::cout << "for " << xhpFileName << " documentJarfile is " << documentJarfile << "\n";
-        std::cout << "for " << xhpFileName << " documentPath is " << documentTitle << "\n";
-#endif
-
         const std::string& fileB = documentPath;
         const std::string& jarfileB = documentJarfile;
         std::string& titleB = documentTitle;
 
         // add once this as its own id.
-        addBookmark(dbBase, pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB);
-
-        // first the database *.db
-        // ByteArrayInputStream bais = null;
-        // ObjectInputStream ois = null;
+        addBookmark(pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB);
 
         const HashSet *hidlist = streamTable.appl_hidlist;
         if (!hidlist)
@@ -605,7 +516,7 @@ void HelpLinker::link() throw( HelpProce
                     anchorB = thishid.substr(1 + index);
                     thishid = thishid.substr(0, index);
                 }
-                addBookmark(dbBase, pFileDbBase_DBHelp, thishid, fileB, anchorB, jarfileB, titleB);
+                addBookmark(pFileDbBase_DBHelp, thishid, fileB, anchorB, jarfileB, titleB);
             }
         }
 
@@ -621,7 +532,7 @@ void HelpLinker::link() throw( HelpProce
                 enumer != aEnd; ++enumer)
             {
                 const std::string &anchor = enumer->first;
-                addBookmark(dbBase, pFileDbBase_DBHelp, documentPath, fileB,
+                addBookmark(pFileDbBase_DBHelp, documentPath, fileB,
                     anchor, jarfileB, titleB);
                 std::string totalId = fakedHid + "#" + anchor;
                 // std::cerr << hzipFileName << std::endl;
@@ -651,19 +562,6 @@ void HelpLinker::link() throw( HelpProce
 
                 helpTextId = URLEncoder::encode(helpTextId);
 
-                DBT keyDbt;
-                memset(&keyDbt, 0, sizeof(keyDbt));
-                keyDbt.data = const_cast<char*>(helpTextId.c_str());
-                keyDbt.size = helpTextId.length();
-
-                DBT textDbt;
-                memset(&textDbt, 0, sizeof(textDbt));
-                textDbt.data = const_cast<char*>(helpTextText.c_str());
-                textDbt.size = helpTextText.length();
-
-                if( helpText != NULL )
-                    helpText->put(helpText, NULL, &keyDbt, &textDbt, 0);
-
                 if( pFileHelpText_DBHelp != NULL )
                     writeKeyValue_DBHelp( pFileHelpText_DBHelp, helpTextId, helpTextText );
             }
@@ -692,11 +590,6 @@ void HelpLinker::link() throw( HelpProce
     catch( const HelpProcessingException& )
     {
         // catch HelpProcessingException to avoid locking data bases
-#ifndef DBHELP_ONLY
-        helpText->close(helpText, 0);
-        dbBase->close(dbBase, 0);
-        keyWord->close(keyWord, 0);
-#endif
         if( pFileHelpText_DBHelp != NULL )
             fclose( pFileHelpText_DBHelp );
         if( pFileDbBase_DBHelp != NULL )
@@ -704,12 +597,6 @@ void HelpLinker::link() throw( HelpProce
         throw;
     }
 
-#ifndef DBHELP_ONLY
-    helpText->close(helpText, 0);
-    dbBase->close(dbBase, 0);
-    helpKeyword.dump(keyWord);
-    keyWord->close(keyWord, 0);
-#endif
     if( pFileHelpText_DBHelp != NULL )
         fclose( pFileHelpText_DBHelp );
     if( pFileDbBase_DBHelp != NULL )
@@ -738,15 +625,6 @@ void HelpLinker::link() throw( HelpProce
         }
     }
 
-/*
-    /////////////////////////////////////////////////////////////////////////
-    /// remove temprary directory for index creation
-    /////////////////////////////////////////////////////////////////////////
-#ifndef CMC_DEBUG
-    if( !bExtensionMode )
-        fs::remove_all( indexDirParentName );
-#endif
-*/
 }
 
 

Modified: incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/l10ntools/source/help/makefile.mk Mon Dec 19 13:03:54 2011
@@ -44,10 +44,6 @@ LIBXSLTINCDIR=external$/libxslt
 CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
 .ENDIF
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
 .IF "$(SYSTEM_EXPAT)" == "YES"
 CFLAGS+=-DSYSTEM_EXPAT
 .ENDIF
@@ -79,13 +75,13 @@ APP1OBJS=\
       $(OBJ)$/HelpLinker.obj \
       $(OBJ)$/HelpCompiler.obj
 
-APP1STDLIBS+=$(SALLIB) $(BERKELEYLIB) $(XSLTLIB) $(EXPATASCII3RDLIB)
+APP1STDLIBS+=$(SALLIB) $(XSLTLIB) $(EXPATASCII3RDLIB)
 
 SHL1TARGET	=$(LIBBASENAME)$(DLLPOSTFIX)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1IMPLIB	=i$(LIBBASENAME)
 SHL1DEF		=$(MISC)$/$(SHL1TARGET).def
-SHL1STDLIBS =$(SALLIB) $(BERKELEYLIB) $(XSLTLIB) $(EXPATASCII3RDLIB)
+SHL1STDLIBS =$(SALLIB) $(XSLTLIB) $(EXPATASCII3RDLIB)
 SHL1USE_EXPORTS	=ordinal
 
 DEF1NAME	=$(SHL1TARGET) 

Modified: incubator/ooo/branches/alg/svgreplacement/main/libxslt/libxslt-bsd.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/libxslt/libxslt-bsd.patch?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/libxslt/libxslt-bsd.patch (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/libxslt/libxslt-bsd.patch Mon Dec 19 13:03:54 2011
@@ -15,7 +15,7 @@
       * Calling localtime() has the side-effect of setting timezone.
       * After we know the timezone, we can adjust for it
       */
-+#if defined(__GLIBC__)
++#if !defined(__FreeBSD__)
      lmt = gmt - timezone;
 -
 +#else	/* FreeBSD DOESN'T HAVE such side-ffect */

Modified: incubator/ooo/branches/alg/svgreplacement/main/more_fonts/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/more_fonts/prj/d.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/more_fonts/prj/d.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/more_fonts/prj/d.lst Mon Dec 19 13:03:54 2011
@@ -3,8 +3,3 @@ mkdir: %COMMON_DEST%\pck%_EXT%
 # TODO: replace explicit versions by wildcard when the build system learns to handle them
 ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\ttf\*.ttf	%COMMON_DEST%\pck%_EXT%\*.ttf
 ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\LICENSE		%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/Liberation*.ttf	%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/License.txt		%COMMON_DEST%\pck%_EXT%\LICENSE_liberation
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf		%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt	%COMMON_DEST%\pck%_EXT%\LICENSE_gentium
-

Modified: incubator/ooo/branches/alg/svgreplacement/main/moz/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/moz/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/moz/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/moz/makefile.mk Mon Dec 19 13:03:54 2011
@@ -35,6 +35,20 @@ TARGET=ooo_mozab
 .INCLUDE :	settings.mk
 
 # --- Files --------------------------------------------------------
+
+.IF "$(WITH_MOZILLA)"=="NO"
+
+all:
+	@echo Support for mozilla is disabled.
+
+.ELIF "$(BUILD_MOZAB)"==""
+
+all:
+	@echo Use of internal mozilla is disabled.
+
+.ELSE
+
+
 # ----- pkg-config start -------
 .INCLUDE .IGNORE : pkgroot.mk
 .IF "$(PKGCONFIG_ROOT)"!=""
@@ -90,6 +104,10 @@ PATCH_FILES = \
     patches/link_fontconfig.patch \
     patches/brokenmakefile.patch
 
+.IF "$(OS)"=="LINUX"
+PATCH_FILES+=patches/nss_linux.patch
+.ENDIF
+
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
 .IF "$(COM)"=="GCC"
@@ -263,11 +281,6 @@ LIBIDL_PREFIX:=$(MOZ_TOOLS)/vc71
 
 # --- Targets ------------------------------------------------------
 
-.IF "$(BUILD_MOZAB)"==""
-all:
-	@echo "Never Build Mozilla."
-.ENDIF	
-
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
@@ -424,3 +437,5 @@ $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip
 .ENDIF # $(GUIBASE)=="aqua"
 
 .INCLUDE : extractfiles.mk
+
+.ENDIF

Modified: incubator/ooo/branches/alg/svgreplacement/main/moz/zipped/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/moz/zipped/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/moz/zipped/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/moz/zipped/makefile.mk Mon Dec 19 13:03:54 2011
@@ -154,8 +154,10 @@ LIBLIST= \
 .ENDIF # .IF "$(GUI)"=="WNT"
 
 
+# On MacOS no include dirs nspr and nss exists in the prebuilt zip, no need to remove them 
+.IF "$(OS)" != "MACOSX" 
 NSS_INCLUDE_LIST= nspr nss
-
+.ENDIF
 
 .IF "$(OS)" == "SOLARIS" 
 .IF "$(CPU)" == "S" #32bit

Modified: incubator/ooo/branches/alg/svgreplacement/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/nss/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/nss/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/nss/makefile.mk Mon Dec 19 13:03:54 2011
@@ -37,9 +37,11 @@ TARGET=nss
 # --- Files --------------------------------------------------------
 
 .IF "$(ENABLE_NSS_MODULE)"!="YES"
+
 all:
 	@echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'"
-.ENDIF	
+
+.ELSE
 
 TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4
 TARFILE_MD5=b92261a5679276c400555004937af965
@@ -47,6 +49,8 @@ TARFILE_ROOTDIR=nss-3.12.6
 PATCH_FILES=nss.patch
 
 .IF "$(OS)"=="MACOSX"
+MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
+.EXPORT : MACOS_SDK_DIR
 PATCH_FILES+=nss_macosx.patch
 .ENDIF # "$(OS)"=="MACOSX"
 
@@ -78,8 +82,7 @@ USE_64:=1
 CPP:=gcc -E $(EXTRA_CFLAGS)
 CXX:=g++ $(EXTRA_CFLAGS)
 CC:=gcc $(EXTRA_CFLAGS)
-MACOS_SDK_DIR*=$(MACDEVSDK)
-.EXPORT : CPP MACOS_SDK_DIR
+.EXPORT : CPP
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(OS)"=="MACOSX"
 
@@ -90,6 +93,7 @@ BUILD_ACTION= $(GNUMAKE) nss_build_all
 #See #i105566# && moz#513024#
 .IF "$(OS)"=="LINUX"
 BUILD_ACTION+=FREEBL_NO_DEPEND=1
+PATCH_FILES+=nss_linux.patch
 .ENDIF
 
 .ENDIF			# "$(GUI)"=="UNX"
@@ -154,16 +158,16 @@ BUILD_ACTION= PATH="$(moz_build)/msys/bi
 	-c "cd $(NSS_BUILD_DIR) && make nss_build_all"
 
 OUT2LIB= \
- 	mozilla$/dist$/out$/lib$/nspr4.lib \
- 	mozilla$/dist$/out$/lib$/nss3.lib \
- 	mozilla$/dist$/out$/lib$/nssdbm3.lib \
- 	mozilla$/dist$/out$/lib$/nssutil3.lib \
- 	mozilla$/dist$/out$/lib$/plc4.lib \
- 	mozilla$/dist$/out$/lib$/plds4.lib \
- 	mozilla$/dist$/out$/lib$/smime3.lib \
- 	mozilla$/dist$/out$/lib$/softokn3.lib \
- 	mozilla$/dist$/out$/lib$/sqlite3.lib \
- 	mozilla$/dist$/out$/lib$/ssl3.lib
+	mozilla$/dist$/out$/lib$/nspr4.lib \
+	mozilla$/dist$/out$/lib$/nss3.lib \
+	mozilla$/dist$/out$/lib$/nssdbm3.lib \
+	mozilla$/dist$/out$/lib$/nssutil3.lib \
+	mozilla$/dist$/out$/lib$/plc4.lib \
+	mozilla$/dist$/out$/lib$/plds4.lib \
+	mozilla$/dist$/out$/lib$/smime3.lib \
+	mozilla$/dist$/out$/lib$/softokn3.lib \
+	mozilla$/dist$/out$/lib$/sqlite3.lib \
+	mozilla$/dist$/out$/lib$/ssl3.lib
 
 .ENDIF			# "$(COM)"=="GCC"
 
@@ -179,4 +183,4 @@ OUTDIR2INC=mozilla$/dist$/public$/nss mo
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk
 
-
+.ENDIF

Modified: incubator/ooo/branches/alg/svgreplacement/main/odk/pack/copying/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/odk/pack/copying/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/odk/pack/copying/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/odk/pack/copying/makefile.mk Mon Dec 19 13:03:54 2011
@@ -50,7 +50,7 @@ IDL_CHAPTER_REFS=idl_chapter_refs.txt
 EXELIST = \
 	$(DESTDIRBIN)/cppumaker$(EXEPOSTFIX) 	\
 	$(DESTDIRBIN)/regcompare$(EXEPOSTFIX) 	\
-	$(DESTDIRBIN)/idlcpp$(EXEPOSTFIX) 	\
+	$(DESTDIRBIN)/ucpp$(EXEPOSTFIX) 	\
 	$(DESTDIRBIN)/idlc$(EXEPOSTFIX) 	\
 	$(DESTDIRBIN)/javamaker$(EXEPOSTFIX) 	\
 	$(DESTDIRBIN)/autodoc$(EXEPOSTFIX) \

Modified: incubator/ooo/branches/alg/svgreplacement/main/odk/util/check.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/odk/util/check.pl?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/odk/util/check.pl (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/odk/util/check.pl Mon Dec 19 13:03:54 2011
@@ -43,7 +43,7 @@ if (-d "$StartDir") {
     # check binaries
     print "check binaries: ";
     if (-d "$StartDir/bin") {
-	my @binarylist = ( "idlc","idlcpp","cppumaker","javamaker",
+	my @binarylist = ( "idlc","ucpp","cppumaker","javamaker",
 			   "regcompare","autodoc",
 			   "unoapploader", "uno-skeletonmaker" );
 

Modified: incubator/ooo/branches/alg/svgreplacement/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/ooo.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/ooo.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/ooo.lst Mon Dec 19 13:03:54 2011
@@ -1,13 +1,18 @@
-http://hg.services.openoffice.org/binaries
-48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
+# Format of this file:
+# Comments start with '#' and are ignored.
+# Empty lines (except for whitespace) are ignored.
+# Full URLs (http and ftp) are loaded as is.
+# Partial URLs (http and ftp) end in '/' and are added to the following lines.
+
+# Load libraries from svn.apache.org.  When the source code was checked out
+# with SVN then these should already be present.
+http://svn.apache.org/repos/asf/incubator/ooo/trunk/ext_sources/
+# Libraries with category A license
 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
-09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
-68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
-18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
@@ -15,34 +20,21 @@ http://hg.services.openoffice.org/binari
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
-35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
-4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
-4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
-b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
-bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
-a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
 a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
 ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
-d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
-e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
 e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
 e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
-ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
 ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
 fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
@@ -55,4 +47,18 @@ cf8a6967f7de535ae257fa411c98eb88-mdds_0.
 220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz
 a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
+0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+# Libraries with category B license
+a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
+68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
+48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
+b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
+ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
+d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
+ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 
+# Temporary
+http://hg.services.openoffice.org/binaries/
+35c94d2df8893241173de1d16b6034c0-swingExSrc.zip

Modified: incubator/ooo/branches/alg/svgreplacement/main/ooo_custom_images/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/ooo_custom_images/prj/build.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/ooo_custom_images/prj/build.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/ooo_custom_images/prj/build.lst Mon Dec 19 13:03:54 2011
@@ -1,4 +0,0 @@
-oci	ooo_custom_images : solenv NULL
-oci	ooo_custom_images			usr1	-	all	oci_mkout NULL
-oci	ooo_custom_images\nologo_broffice	nmake	-	all	oci_nologo_broffice NULL
-

Modified: incubator/ooo/branches/alg/svgreplacement/main/ooo_custom_images/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/ooo_custom_images/prj/d.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/ooo_custom_images/prj/d.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/ooo_custom_images/prj/d.lst Mon Dec 19 13:03:54 2011
@@ -1,2 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\broffice_nologo
-..\%__SRC%\bin\broffice_nologo\*.zip %COMMON_DEST%\bin%_EXT%\broffice_nologo

Modified: incubator/ooo/branches/alg/svgreplacement/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/postprocess/packcomponents/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/postprocess/packcomponents/makefile.mk Mon Dec 19 13:03:54 2011
@@ -259,9 +259,7 @@ my_components += productregistration.jar
 my_components += \
     LuceneHelpWrapper \
     ScriptFramework \
-    ScriptProviderForBeanShell \
     ScriptProviderForJava \
-    ScriptProviderForJavaScript \
     XMergeBridge \
     XSLTValidate \
     agenda \
@@ -274,6 +272,12 @@ my_components += \
     report \
     table \
     web
+.IF "$(ENABLE_BEANSHELL)" == "YES"
+my_components += ScriptProviderForBeanShell
+.END
+.IF "$(ENABLE_JAVASCRIPT)" == "YES"
+my_components += ScriptProviderForJavaScript
+.END
 .END
 
 .IF "$(WITH_BINFILTER)" != "NO"

Modified: incubator/ooo/branches/alg/svgreplacement/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/postprocess/rebase/coffbase.txt?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/postprocess/rebase/coffbase.txt (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/postprocess/rebase/coffbase.txt Mon Dec 19 13:03:54 2011
@@ -159,7 +159,6 @@ jvmfwk3.dll      0x0000000062330000 0x00
 ldapbe2.uno.dll  0x0000000062300000 0x00020000
 legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000
 libcurl.dll      0x0000000062290000 0x00030000
-libdb47.dll      0x00000000621f0000 0x00090000
 libeay32.dll     0x00000000620d0000 0x00110000
 libexslt.dll     0x00000000620a0000 0x00020000
 librdf.dll       0x0000000062070000 0x00020000



Mime
View raw message