From 73ff1944409ee6056ef8fb02611e7d2ab69466fd Mon Sep 17 00:00:00 2001 From: Todd Berman Date: Sat, 26 Jun 2004 21:21:55 +0000 Subject: [PATCH] 2004-06-26 Todd Berman * configure.in: Add GACUTIL_FLAGS * gtk-sharp.pub: remove. * gtk-sharp.snk: add full keyfile. * makefile.am: dist gtk-sharp.snk. * sources/.cvsignore: ignore 1.0.0 dir. * gtksourceview/makefile.am: modifications to use .snk and sign the assembly properly. svn path=/trunk/gtksourceview-sharp/; revision=30449 --- ChangeLog | 10 ++++++++++ configure.in | 5 ++++- gtk-sharp.pub | Bin 160 -> 0 bytes gtk-sharp.snk | Bin 0 -> 596 bytes gtksourceview/makefile.am | 16 ++++++++-------- makefile.am | 2 +- sources/.cvsignore | 2 +- 7 files changed, 24 insertions(+), 11 deletions(-) delete mode 100644 gtk-sharp.pub create mode 100755 gtk-sharp.snk diff --git a/ChangeLog b/ChangeLog index 55afa7d..211ea48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-06-26 Todd Berman + + * configure.in: Add GACUTIL_FLAGS + * gtk-sharp.pub: remove. + * gtk-sharp.snk: add full keyfile. + * makefile.am: dist gtk-sharp.snk. + * sources/.cvsignore: ignore 1.0.0 dir. + * gtksourceview/makefile.am: modifications to use .snk and sign + the assembly properly. + 2004-06-06 John Luke * doc/Makefile.am: install docs conditionally on monodoc diff --git a/configure.in b/configure.in index 409afd5..6343315 100644 --- a/configure.in +++ b/configure.in @@ -56,10 +56,13 @@ AC_PATH_PROG(GACUTIL, gacutil, no) if test "x$GACUTIL" = "xno" ; then AC_MSG_ERROR([No gacutil tool found]) fi - + +GACUTIL_FLAGS='/package gtk-sharp /gacdir $(libdir)' + AC_SUBST(RUNTIME) AC_SUBST(CSC) AC_SUBST(GACUTIL) +AC_SUBST(GACUTIL_FLAGS) AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) diff --git a/gtk-sharp.pub b/gtk-sharp.pub deleted file mode 100644 index 968d366a24873d132e2ac485b9a3010e1d7abe88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK$ABme*efB*oL000060ssI2Bme+XQ$aBR1ONa50097T>ugnZQk=hXME9oZ z1!9Ex>fk%i^2`$~oJk6^3F@%5YtBTS^#j?!s2)-Uh0VTj;`@+8ORNO?Vj`#jn75&) zv#*&NK_eu)LnZdOWxHhS_R+!y)pIT1yl|&Dp5;CaByKW!bQ;hF1LT-O;hXb&8H+$6 OCd)R7!s=v}qugnZQk=hXME9oZ1!9Ex>fk%i^2`$~ zoJk6^3F@%5YtBTS^#j?!s2)-Uh0VTj;`@+8ORNO?Vj`#jn75&)v#*&NK_eu)LnZdO zWxHhS_R+!y)pIT1yl|&Dp5;CaByKW!bQ;hF1LT-O;hXb&8H+$6Cd)R7!s=v}q9*Ensq}-$>Uq=GVd>LtCN(@iYFB~NM}Q?kV!^ZM4c<0(N+K9y*po*d@!nt zg7pq4?ZaJ`_f*`^ZX{Q82dpvmAM!fXFFOB78X|&PT1If4Y51uC4wzdb%wh-vYJgBbjU~^p(XEgz| zrtr|V3f${ih0q!ITYS)(4-zwCuETyJRnuea;|3v!s?9-@wMW*_x#z*vTmyJ4W_%Ys zG~Amq`cZXx@|qBMT+(hEI}v{Ue>$87ccv|Wu~@1RHKF1pY-RwR6MAi$;agh&In)|7 zg*|88kti}%8oG>cXFlAar23RLY7ZbxgqmB!0dhOfAr-`C=J6$6+dUe~Pczt-sPXx? ziWKrnMs$FE4OMgr2G)>q+627mopx0Gc7Ct~m^KGR6Siu;Nv3Q%K z>3+^D3rnZl1p{KPl_Ls^O!P!PWTN_0ju7H&KUNiX2qxi!E_;z|702^mH2{0R0pkOm iYA#iqyQAFXEMWuqRt0h5>VYN?a$@rO&Q*B*haWFy8y;o= literal 0 HcmV?d00001 diff --git a/gtksourceview/makefile.am b/gtksourceview/makefile.am index c32c08b..3d1b010 100644 --- a/gtksourceview/makefile.am +++ b/gtksourceview/makefile.am @@ -39,22 +39,22 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) customs = SourceBuffer.custom build_customs = $(addprefix $(srcdir)/, $(customs)) -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(LIBRARY): generated-stamp $(build_sources) gtk-sharp.pub +$(LIBRARY): generated-stamp $(build_sources) gtk-sharp.snk $(CSC) --unsafe --target library $(ASSEMBLIES) \ generated/*.cs $(build_sources) -o $(LIBRARY) -CLEANFILES = $(LIBRARY) generated/*.cs generated-stamp gtksourceview-api.xml gtk-sharp.pub +CLEANFILES = $(LIBRARY) generated/*.cs generated-stamp gtksourceview-api.xml gtk-sharp.snk distclean-local: rm -f makefile install-data-local: - echo "$(GACUTIL) /i $(LIBRARY) /f /package gtk-sharp /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(LIBRARY) /f /package gtk-sharp /root $(DESTDIR)$(libdir) || exit 1; + echo "$(GACUTIL) /i $(LIBRARY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(LIBRARY) /f $(GACUTIL_FLAGS) || exit 1; uninstall-local: - echo "$(GACUTIL) /u $(LIBRARY_NAME) /package gtk-sharp /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(LIBRARY_NAME) /package gtk-sharp /root $(DESTDIR)$(libdir) || exit 1; + echo "$(GACUTIL) /u $(LIBRARY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(LIBRARY_NAME) $(GACUTIL_FLAGS) || exit 1; diff --git a/makefile.am b/makefile.am index ea3b8cb..9dbcdf8 100644 --- a/makefile.am +++ b/makefile.am @@ -1,6 +1,6 @@ SUBDIRS= gtksourceview doc -EXTRA_DIST= nemerle.lang vbnet.lang gtksourceview-sharp.pc.in $(mimeinfo_DATA) gtk-sharp.pub +EXTRA_DIST= nemerle.lang vbnet.lang gtksourceview-sharp.pc.in $(mimeinfo_DATA) gtk-sharp.snk extra_langdir= @gtksourceview_prefix@/share/gtksourceview-1.0/language-specs extra_lang_DATA= nemerle.lang vbnet.lang diff --git a/sources/.cvsignore b/sources/.cvsignore index 63035ee..e05f73e 100644 --- a/sources/.cvsignore +++ b/sources/.cvsignore @@ -1 +1 @@ -gtksourceview-0.7.0 +gtksourceview-1.0.0