I've been working on fixing the commandline processing, which sucks
a lot at the moment.

This patch should work for GTK and GNOME and not break any other
platforms.  I'm not going to commit it until I (or some other nice person)
makes popt build properly as a peer in both diving make and configure,
because it would otherwise add a build-dep to the GTK build.

Ideally someone would try out the patch and confirm that it works for them
too.

Also I hacked the GTK makefile explicitly to add -lpopt, which is bad.
I'll try to fix it later.

pat
Index: src/wp/ap/win/ap_Win32App.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32App.cpp,v
retrieving revision 1.80
diff -r1.80 ap_Win32App.cpp
900c900,901
<                       if (UT_stricmp(m_pArgs->m_argv[k],"-script") == 0)
---
>                       if ((UT_stricmp(m_pArgs->m_argv[k],"-script") == 0) ||
>                               (UT_stricmp(m_pArgs->m_argv[k],"--script") == 0))
905c906,907
<                       else if (UT_stricmp(m_pArgs->m_argv[k],"-lib") == 0)
---
>                       else if ((UT_stricmp(m_pArgs->m_argv[k],"-lib") == 0) ||
>                                        (UT_stricmp(m_pArgs->m_argv[k],"--lib") == 0))
911c913,914
<                       else if (UT_stricmp(m_pArgs->m_argv[k],"-dumpstrings") == 0)
---
>                       else if ((UT_stricmp(m_pArgs->m_argv[k],"-dumpstrings") == 0) 
>||
>                                         
>(UT_stricmp(m_pArgs->m_argv[k],"--dumpstrings") == 0))
922c925,926
<                       else if (UT_stricmp(m_pArgs->m_argv[k],"-nosplash") == 0)
---
>                       else if (UT_stricmp(m_pArgs->m_argv[k],"-nosplash") == 0 ||
>                                        UT_stricmp(m->pargv[k], "--nosplash") == 0)
926c930,931
<                       else if (UT_stricmp (m_pArgs->m_argv[k],"-to") == 0)
---
>                       else if (UT_stricmp(m_pArgs->m_argv[k],"-to") == 0 ||
>                                        UT_stricmp(m->pargv[k], "--to") == 0)
931c936,937
<                       else if (UT_stricmp (m_pArgs->m_argv[k], "-show") == 0)
---
>                       else if (UT_stricmp (m_pArgs->m_argv[k], "-show") == 0 ||
>                                        UT_stricmp(m->pargv[k], "--show") == 0)
935c941,942
<                       else if (UT_stricmp (m_pArgs->m_argv[k], "-verbose") == 0)
---
>                       else if (UT_stricmp (m_pArgs->m_argv[k], "-verbose") == 0 ||
>                                        UT_stricmp(m->pargv[k], "--verbose") == 0)
946c953,955
<                                 (UT_stricmp (m_pArgs->m_argv[k], "-ft") == 0) )
---
>                                 (UT_stricmp (m_pArgs->m_argv[k], "-ft") == 0) ||
>                                         (UT_stricmp(m->pargv[k], "--filetype")) == 0 
>||
>                                         (UT_stricmp(m->pargv[k], "--ft") == 0)))
959,961c968,970
<                               strcat( pszMessage, "-to\nThe target format of the 
file\n\n" );
<                               strcat( pszMessage, "-verbose\nThe verbosity level (0, 
1, 2)\n\n" );
<                               strcat( pszMessage, "-show\nIf you really want to 
start the GUI (even if you use the -to or -help options)\n\n" );
---
>                               strcat( pszMessage, "--to\nThe target format of the 
>file\n\n" );
>                               strcat( pszMessage, "--verbose\nThe verbosity level 
>(0, 1, 2)\n\n" );
>                               strcat( pszMessage, "--show\nIf you really want to 
>start the GUI (even if you use the -to or -help options)\n\n" );
963c972
<                               strcat( pszMessage, "-dumpstrings\nDump strings 
strings to file\n\n" );
---
>                               strcat( pszMessage, "--dumpstrings\nDump strings 
>strings to file\n\n" );
965,967c974,976
<                               strcat( pszMessage, "-geometry <geom>\nSet initial 
frame geometry [UNIMPLEMENTED]\n\n" );
<                               strcat( pszMessage, "-lib <dir>\nUse dir for 
application components\n\n" );
<                               strcat( pszMessage, "-nosplash\nDo not show splash 
screen\n\n" );
---
>                               strcat( pszMessage, "--geometry <geom>\nSet initial 
>frame geometry [UNIMPLEMENTED]\n\n" );
>                               strcat( pszMessage, "--lib <dir>\nUse dir for 
>application components\n\n" );
>                               strcat( pszMessage, "--nosplash\nDo not show splash 
>screen\n\n" );

Reply via email to