Author: benm
Date: 2005-05-25 16:43:04 -0400 (Wed, 25 May 2005)
New Revision: 45014
Added:
trunk/monodoc/scripts/
trunk/monodoc/scripts/Makefile.am
trunk/monodoc/scripts/mdassembler.in
trunk/monodoc/scripts/mdcs2ecma.in
trunk/monodoc/scripts/mdnormalizer.in
trunk/monodoc/scripts/mdvalidater.in
trunk/monodoc/scripts/mod.in
trunk/monodoc/scripts/monodocer.in
trunk/monodoc/scripts/monodocs2html.in
trunk/monodoc/scripts/monodocs2slashdoc.in
Removed:
trunk/monodoc/monodoc.desktop
Modified:
trunk/monodoc/ChangeLog
trunk/monodoc/Makefile.am
trunk/monodoc/browser/Makefile.am
trunk/monodoc/configure.in
trunk/monodoc/monodoc.pc.in
Log:
2005-05-25 Ben Maurer <[EMAIL PROTECTED]>
* configure.in, */Makefile.am
- Remove desktop file, monodoc.in (->mono-tools)
- Give each thing its own script
- Fix usages of libdir
- use @RUNTIME@ rather than mono
- add sourcesdir to the .pc file
- General cleanups
Modified: trunk/monodoc/ChangeLog
===================================================================
--- trunk/monodoc/ChangeLog 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/ChangeLog 2005-05-25 20:43:04 UTC (rev 45014)
@@ -1,3 +1,13 @@
+2005-05-25 Ben Maurer <[EMAIL PROTECTED]>
+
+ * configure.in, */Makefile.am
+ - Remove desktop file, monodoc.in (->mono-tools)
+ - Give each thing its own script
+ - Fix usages of libdir
+ - use @RUNTIME@ rather than mono
+ - add sourcesdir to the .pc file
+ - General cleanups
+
2005-05-23 Mike Kestner <[EMAIL PROTECTED]>
* configure.in : bump svn version.
Modified: trunk/monodoc/Makefile.am
===================================================================
--- trunk/monodoc/Makefile.am 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/Makefile.am 2005-05-25 20:43:04 UTC (rev 45014)
@@ -1,32 +1,10 @@
-SUBDIRS = browser class extras tools
+SUBDIRS = browser class extras tools scripts
-EXTRA_DIST = monodoc.in monodoc.png monodoc.svg monodoc.desktop monodoc.pc
mono.pub
+EXTRA_DIST = monodoc.png monodoc.svg monodoc.pc mono.pub
-bin_SCRIPTS = monodoc mod monodocer monodocs2html monodocs2slashdoc
-
-CLEANFILES = $(bin_SCRIPTS)
-
-desktopdir = $(datadir)/applications
-desktop_DATA = monodoc.desktop
-
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = monodoc.png
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = monodoc.pc
-mod: monodoc
- cp monodoc mod
-
-monodocer: monodoc
- cp monodoc monodocer
-
-monodocs2html: monodoc
- cp monodoc monodocs2html
-
-monodocs2slashdoc: monodoc
- cp monodoc monodocs2slashdoc
-
dist-hook:
mkdir $(distdir)/ecma334
cp $(srcdir)/ecma334/*xml $(distdir)/ecma334
Modified: trunk/monodoc/browser/Makefile.am
===================================================================
--- trunk/monodoc/browser/Makefile.am 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/browser/Makefile.am 2005-05-25 20:43:04 UTC (rev 45014)
@@ -1,17 +1,14 @@
-assemblydir = $(libdir)
-
monodoc_DATA = assembler.exe normalize.exe monodoc.xml mod.exe validate.exe
cs2ecma.exe
noinst_DATA = monodoc.dll monodoc.dll.config
CLEANFILES = monodoc.dll assembler.exe $(monodoc_unix_DATA) normalize.exe
mod.exe validate.exe cs2ecma.exe
DISTCLEANFILE = AssemblyInfo.cs
-CSC=mcs
if USE_CYGPATH
-GACDIR=`cygpath -w $(libdir)`
-GACROOT=`cygpath -w $(DESTDIR)$(libdir)`
+GACDIR=`cygpath -w $(prefix)/lib`
+GACROOT=`cygpath -w $(DESTDIR)$(prefix)/lib`
else
-GACDIR=$(libdir)
-GACROOT=$(DESTDIR)$(libdir)
+GACDIR=$(prefix)/lib
+GACROOT=$(DESTDIR)$(prefix)/lib
endif
monodoc_sources = \
Modified: trunk/monodoc/configure.in
===================================================================
--- trunk/monodoc/configure.in 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/configure.in 2005-05-25 20:43:04 UTC (rev 45014)
@@ -11,11 +11,24 @@
AC_SUBST(API_VERSION)
AC_PATH_PROG(GACUTIL, gacutil, no)
+AC_PATH_PROG(RUNTIME, mono, no)
+AC_PATH_PROG(CSC, mcs, no)
+
+
if test "x$GACUTIL" = "xno" ; then
AC_MSG_ERROR([No gacutil tool found])
fi
AC_SUBST(GACUTIL)
+if test "x$GACUTIL" = "xno" ; then
+ AC_MSG_ERROR([No mono found])
+fi
+
+CS="C#"
+if test "x$MCS" = "xno" ; then
+ AC_MSG_ERROR([No $CS compiler found])
+fi
+
use_cygpath=no
monodoc_refdir=$monodocdir
case "$host" in
@@ -37,4 +50,13 @@
monodoc.pc
monodoc
browser/AssemblyInfo.cs
+scripts/Makefile
+scripts/mod
+scripts/monodocer
+scripts/monodocs2slashdoc
+scripts/monodocs2html
+scripts/mdassembler
+scripts/mdnormalizer
+scripts/mdvalidater
+scripts/mdcs2ecma
])
Deleted: trunk/monodoc/monodoc.desktop
===================================================================
--- trunk/monodoc/monodoc.desktop 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/monodoc.desktop 2005-05-25 20:43:04 UTC (rev 45014)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Monodoc
-GenericName=Documentation Browser
-Comment=Monodoc Documentation Browser
-Exec=monodoc
-Icon=monodoc.png
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Development;
Modified: trunk/monodoc/monodoc.pc.in
===================================================================
--- trunk/monodoc/monodoc.pc.in 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/monodoc.pc.in 2005-05-25 20:43:04 UTC (rev 45014)
@@ -1,8 +1,9 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/lib
[EMAIL PROTECTED]@/sources
Name: Monodoc
Description: Monodoc - Mono Documentation Tools
Version: @VERSION@
-Libs: /r:${libdir}/mono/monodoc/monodoc.dll
+Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll
Property changes on: trunk/monodoc/scripts
___________________________________________________________________
Name: svn:ignore
+ mdassembler
mdcs2ecma
mdnormalizer
mdvalidater
mod
monodocer
monodocs2html
monodocs2slashdoc
Makefile
Makefile.in
Added: trunk/monodoc/scripts/Makefile.am
===================================================================
--- trunk/monodoc/scripts/Makefile.am 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/scripts/Makefile.am 2005-05-25 20:43:04 UTC (rev 45014)
@@ -0,0 +1,21 @@
+EXTRA_DIST = \
+ mdassembler.in \
+ mdcs2ecma.in \
+ mdnormalizer.in \
+ mdvalidater.in \
+ mod.in \
+ monodocer.in \
+ monodocs2html.in \
+ monodocs2slashdoc.in
+
+bin_SCRIPTS = \
+ mdassembler \
+ mdcs2ecma \
+ mdnormalizer \
+ mdvalidater \
+ mod \
+ monodocer \
+ monodocs2html \
+ monodocs2slashdoc
+
+CLEANFILES = $(bin_SCRIPTS)
Added: trunk/monodoc/scripts/mdassembler.in
===================================================================
--- trunk/monodoc/scripts/mdassembler.in 2005-05-25 20:29:51 UTC (rev
45013)
+++ trunk/monodoc/scripts/mdassembler.in 2005-05-25 20:43:04 UTC (rev
45014)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+exec @RUNTIME@ $monodocdir/assembler.exe "$@"
Added: trunk/monodoc/scripts/mdcs2ecma.in
===================================================================
--- trunk/monodoc/scripts/mdcs2ecma.in 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/scripts/mdcs2ecma.in 2005-05-25 20:43:04 UTC (rev 45014)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+exec @RUNTIME@ $monodocdir/cs2ecma.exe "$@"
Added: trunk/monodoc/scripts/mdnormalizer.in
===================================================================
--- trunk/monodoc/scripts/mdnormalizer.in 2005-05-25 20:29:51 UTC (rev
45013)
+++ trunk/monodoc/scripts/mdnormalizer.in 2005-05-25 20:43:04 UTC (rev
45014)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+exec @RUNTIME@ $monodocdir/normalize.exe "$@"
Added: trunk/monodoc/scripts/mdvalidater.in
===================================================================
--- trunk/monodoc/scripts/mdvalidater.in 2005-05-25 20:29:51 UTC (rev
45013)
+++ trunk/monodoc/scripts/mdvalidater.in 2005-05-25 20:43:04 UTC (rev
45014)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+exec @RUNTIME@ $monodocdir/validate.exe "$@"
Added: trunk/monodoc/scripts/mod.in
===================================================================
--- trunk/monodoc/scripts/mod.in 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/scripts/mod.in 2005-05-25 20:43:04 UTC (rev 45014)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+if test x$1 = x; then
+ echo Usage is: mod TOPIC
+ exit 1;
+fi
+
[EMAIL PROTECTED]@ $monodocdir/mod.exe $1 | lynx -dump -stdin -force_html |
${PAGER:-more}
Added: trunk/monodoc/scripts/monodocer.in
===================================================================
--- trunk/monodoc/scripts/monodocer.in 2005-05-25 20:29:51 UTC (rev 45013)
+++ trunk/monodoc/scripts/monodocer.in 2005-05-25 20:43:04 UTC (rev 45014)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+exec @RUNTIME@ $monodocdir/monodocer.exe $@
Added: trunk/monodoc/scripts/monodocs2html.in
===================================================================
--- trunk/monodoc/scripts/monodocs2html.in 2005-05-25 20:29:51 UTC (rev
45013)
+++ trunk/monodoc/scripts/monodocs2html.in 2005-05-25 20:43:04 UTC (rev
45014)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+exec @RUNTIME@ $monodocdir/monodocs2html.exe $*
Added: trunk/monodoc/scripts/monodocs2slashdoc.in
===================================================================
--- trunk/monodoc/scripts/monodocs2slashdoc.in 2005-05-25 20:29:51 UTC (rev
45013)
+++ trunk/monodoc/scripts/monodocs2slashdoc.in 2005-05-25 20:43:04 UTC (rev
45014)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+exec @RUNTIME@ exec mono $monodocdir/monodocs2slashdoc.exe $*
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
