Author: miguel
Date: 2008-01-22 16:34:19 -0500 (Tue, 22 Jan 2008)
New Revision: 93578
Added:
trunk/mono-tools/gui-compare/Makefile.am
Removed:
trunk/mono-tools/gui-compare/Makefile
trunk/mono-tools/gui-compare/configure
Modified:
trunk/mono-tools/gui-compare/gtk-gui/guicompare.ProviderSelector.cs
Log:
Autotoolize
Deleted: trunk/mono-tools/gui-compare/Makefile
===================================================================
--- trunk/mono-tools/gui-compare/Makefile 2008-01-22 21:29:48 UTC (rev
93577)
+++ trunk/mono-tools/gui-compare/Makefile 2008-01-22 21:34:19 UTC (rev
93578)
@@ -1,73 +0,0 @@
-
-EXTRA_DIST = gui-compare.make rules.make configure Makefile.include
Mono.Cecil.dll
-
-all: all-recursive
-
-top_srcdir=.
-include $(top_srcdir)/config.make
-include $(top_srcdir)/rules.make
-
-#include $(top_srcdir)/custom-hooks.make
-
-#Warning: This is an automatically generated file, do not edit!
-ifeq ($(CONFIG),DEBUG)
- SUBDIRS = .
-endif
-ifeq ($(CONFIG),RELEASE)
- SUBDIRS = .
-endif
-
-# Include project specific makefile
-include gui-compare.make
-
-CONFIG_MAKE=$(top_srcdir)/config.make
-
-%-recursive: $(CONFIG_MAKE)
- @set . $$MAKEFLAGS; final_exit=:; \
- case $$2 in --unix) shift ;; esac; \
- case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
- make pre-$*-hook prefix=$(prefix) ; \
- for dir in $(SUBDIRS); do \
- case $$dir in \
- .) make $*-local || { final_exit="exit 1"; $$dk; };;\
- *) (cd $$dir && make $*) || { final_exit="exit 1"; $$dk; };;\
- esac \
- done; \
- make post-$*-hook prefix=$(prefix) ; \
- $$final_exit
-
-$(CONFIG_MAKE):
- echo "You must run configure first"
- exit 1
-
-clean: clean-recursive
-install: install-recursive
-uninstall: uninstall-recursive
-
-dist: $(CONFIG_MAKE)
- rm -rf $(PACKAGE)-$(VERSION)
- mkdir $(PACKAGE)-$(VERSION)
- make pre-dist-hook distdir=$$distdir
- for dir in $(SUBDIRS); do \
- pkgdir=`pwd`/$(PACKAGE)-$(VERSION); \
- mkdir $$pkgdir/$$dir || true; \
- case $$dir in \
- .) make dist-local distdir=$$pkgdir || exit 1;; \
- *) (cd $$dir; make dist-local distdir=$$pkgdir/$$dir) || exit
1;; \
- esac \
- done
- (make dist-local distdir=$(PACKAGE)-$(VERSION))
- make
- make post-dist-hook distsir=$$distdir
- tar czvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
- rm -rf $(PACKAGE)-$(VERSION)
- @echo "=========================================="
- @echo "$(PACKAGE)-$(VERSION) has been packaged >
$(PACKAGE)-$(VERSION).tar.gz"
- @echo "=========================================="
-
-distcheck: dist
- (mkdir test; cd test; \
- tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz; cd $(PACKAGE)-$(VERSION); \
- ./configure --prefix=$$(cd `pwd`/..; pwd); \
- make && make install && make dist);
- rm -rf test
Added: trunk/mono-tools/gui-compare/Makefile.am
===================================================================
--- trunk/mono-tools/gui-compare/Makefile.am 2008-01-22 21:29:48 UTC (rev
93577)
+++ trunk/mono-tools/gui-compare/Makefile.am 2008-01-22 21:34:19 UTC (rev
93578)
@@ -0,0 +1,61 @@
+guicomparedir=$(prefix)/lib/gui-compare
+guicompare_DATA = gui-compare.exe
+
+CLEANFILES = gui-compare.exe gui-compare.mdb
+
+bin_SCRIPTS = gui-compare
+
+gui_compare_sources = \
+ ./gtk-gui/generated.cs \
+ ./MainWindow.cs \
+ ./gtk-gui/MainWindow.cs \
+ ./Main.cs \
+ ./AssemblyInfo.cs \
+ ./InfoManager.cs \
+ ./CompareContext.cs \
+ ./Comparison.cs \
+ ./Metadata.cs \
+ ./MasterMetadata.cs \
+ ./Masterinfo.cs \
+ ./CecilMetadata.cs \
+ ./ProviderSelector.cs \
+ ./gtk-gui/guicompare.ProviderSelector.cs\
+ ./AssemblyResolver.cs \
+ ./Config.cs \
+ ./CustomCompare.cs \
+ ./gtk-gui/GuiCompare.CustomCompare.cs
+
+gui_compare_resources = \
+ $(srcdir)/gtk-gui/gui.stetic \
+ $(srcdir)/cm/c.gif \
+ $(srcdir)/cm/d.gif \
+ $(srcdir)/cm/e.gif \
+ $(srcdir)/cm/en.gif \
+ $(srcdir)/cm/f.gif \
+ $(srcdir)/cm/i.gif \
+ $(srcdir)/cm/m.gif \
+ $(srcdir)/cm/n.gif \
+ $(srcdir)/cm/p.gif \
+ $(srcdir)/cm/r.gif \
+ $(srcdir)/cm/s.gif \
+ $(srcdir)/cm/sc.gif \
+ $(srcdir)/cm/se.gif \
+ $(srcdir)/cm/sm.gif \
+ $(srcdir)/cm/st.gif \
+ $(srcdir)/cm/sx.gif \
+ $(srcdir)/cm/tb.gif \
+ $(srcdir)/cm/tm.gif \
+ $(srcdir)/cm/tp.gif \
+ $(srcdir)/cm/w.gif \
+ $(srcdir)/cm/y.gif \
+ $(srcdir)/gtk-gui/objects.xml \
+ $(srcdir)/cm/mn.png
+
+EXTRA_DIST = $(gui_compare_sources) $(gui_compare_resources) gui-compare.mds
gui-compare.mdp
+
+packages = -pkg:gtk-sharp-2.0 -pkg:glib-sharp-2.0 -pkg:glade-sharp-2.0
-pkg:cecil
+assemblies = -r:System -r:Mono.Posix -r:System.Xml
+ress= $(foreach res,$(gui_compare_resources), $(addprefix
-resource:,$(res)),$(notdir $(res)))
+
+gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources)
+ $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug
-define:DEBUG -target:exe -out:gui-compare.exe $(gui_compare_sources) $(ress)
$(packages) $(assemblies)
Deleted: trunk/mono-tools/gui-compare/configure
===================================================================
--- trunk/mono-tools/gui-compare/configure 2008-01-22 21:29:48 UTC (rev
93577)
+++ trunk/mono-tools/gui-compare/configure 2008-01-22 21:34:19 UTC (rev
93578)
@@ -1,109 +0,0 @@
-#!/bin/bash
-VERSION=0.1
-PACKAGE=gui_compare
-prefix=/usr/local
-config=DEBUG
-configurations=" RELEASE DEBUG"
-common_packages=" glade-sharp-2.0;2.10.2 glib-sharp-2.0;2.10.2
gtk-sharp-2.0;2.10.2"
-
-
-usage ()
-{
- echo "Usage : configure [--prefix=PREFIX] [--config=CONFIG]"
- echo
- echo "Configurations available :"
- for c in $configurations; do
- if [ "$c" = "$config" ]; then
- echo " $c (Default)"
- else
- echo " $c"
- fi
- done
-}
-
-validate_config ()
-{
- test -z "$1" && return 0
- for c in $configurations; do
- if [ "$c" = "$1" ]; then
- return 1
- fi
- done
- return 0
-}
-
-check_package ()
-{
- name=`echo $1 | cut -d\; -f1`
- version=`echo $1 | cut -d\; -f2`
-
- echo -n "Checking for package '$name'.." | tee -a config.log
- pkg-config --atleast-version=$version $name
- if [ $? -ne 0 ]; then
- echo " ERROR: Package named '$name' >= $version not found." |
tee -a config.log
- echo "Try adjusting your PKG_CONFIG_PATH environment variable."
| tee -a config.log
- return 1
- fi
- echo " found." | tee -a config.log
-}
-
-check_required_packages ()
-{
- echo "Looking for required packages" | tee config.log
- var=required_packages_$config
- for pkg in $common_packages ${!var}; do
- check_package $pkg
- retval=$?
- [ $retval -ne 0 ] && return $retval
- done
- return 0
-}
-
-while test x$1 != x; do
- case $1 in
- --prefix=*)
- prefix=`echo $1 | sed 's/--prefix=//'`
- ;;
- --prefix)
- shift
- prefix=$1
- ;;
- --config=*)
- conf=`echo $1 | sed 's/--config=//'`
- validate_config "$conf"
- if [ $? -eq 1 ]; then
- config=$conf
- else
- echo "Invalid config name - $conf"
- usage
- exit 1
- fi
- ;;
- --help)
- usage
- exit
- ;;
- *)
- echo Unknown argument $1 >&2
- usage
- exit 1
- ;;
- esac
- shift
-done
-
-check_required_packages
-[ $? -eq 1 ] && exit 1
-
-echo "prefix=$prefix" > config.make
-echo "RUNTIME=mono" >> config.make
-echo "ASSEMBLY_VERSION=$VERSION.0.0" >> config.make
-echo "VERSION=$VERSION" >> config.make
-echo "PACKAGE=$PACKAGE" >> config.make
-echo "CONFIG=$config" >> config.make
-
-echo
-echo "$PACKAGE has been configured with "
-echo " prefix = $prefix"
-echo " config = $config"
-echo
Modified: trunk/mono-tools/gui-compare/gtk-gui/guicompare.ProviderSelector.cs
===================================================================
--- trunk/mono-tools/gui-compare/gtk-gui/guicompare.ProviderSelector.cs
2008-01-22 21:29:48 UTC (rev 93577)
+++ trunk/mono-tools/gui-compare/gtk-gui/guicompare.ProviderSelector.cs
2008-01-22 21:34:19 UTC (rev 93578)
@@ -71,7 +71,6 @@
this.radiobutton1 = new
Gtk.RadioButton(Mono.Unix.Catalog.GetString("API Description"));
this.radiobutton1.CanFocus = true;
this.radiobutton1.Name = "radiobutton1";
- this.radiobutton1.Active = true;
this.radiobutton1.DrawIndicator = true;
this.radiobutton1.UseUnderline = true;
this.radiobutton1.Group = new GLib.SList(System.IntPtr.Zero);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
