From svnnotify ＠ sourceforge.jp Tue Apr 20 10:09:36 2010 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Apr 2010 10:09:36 +0900 Subject: [Swfed-svn] =?utf-8?q?swfed-svn_=5B187=5D_-_PHP=5FSUBST=28SWFED?= =?utf-8?b?X1NIQVJFRF9MSUJBREQpICDjgpLmnInlirnljJY=?= Message-ID: <1271725776.781710.16338.nullmailer@users.sourceforge.jp> Revision: 187 http://sourceforge.jp/projects/swfed/svn/view?view=rev&revision=187 Author: yoya Date: 2010-04-20 10:09:36 +0900 (Tue, 20 Apr 2010) Log Message: ----------- - PHP_SUBST(SWFED_SHARED_LIBADD) を有効化 - giflib, ligpng の定義が誤っていたので修正 (zlibからコピペ後の変更漏れ) very thanks! > kajidai Modified Paths: -------------- trunk/src/config-lib.m4 trunk/src/config.m4 -------------- next part -------------- Modified: trunk/src/config-lib.m4 =================================================================== --- trunk/src/config-lib.m4 2010-03-15 14:56:28 UTC (rev 186) +++ trunk/src/config-lib.m4 2010-04-20 01:09:36 UTC (rev 187) @@ -90,12 +90,12 @@ AC_MSG_RESULT([png.h not found.]) else AC_MSG_RESULT([$PHP_PNG_DIR]) - if test "z$PHP_LIBDIR" != "z"; then + if test "png$PHP_LIBDIR" != "png"; then dnl PHP5+ - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_PNG_DIR/$PHP_LIBDIR, SWFED_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/$PHP_LIBDIR, SWFED_SHARED_LIBADD) else dnl PHP4 - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_PNG_DIR/lib, SWFED_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, SWFED_SHARED_LIBADD) fi PHP_ADD_INCLUDE($PHP_PNG_INCDIR) fi @@ -135,12 +135,12 @@ AC_MSG_RESULT([gif_lib.h not found.]) else AC_MSG_RESULT([$PHP_GIF_DIR]) - if test "z$PHP_LIBDIR" != "z"; then + if test "gif$PHP_LIBDIR" != "gif"; then dnl PHP5+ - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_GIF_DIR/$PHP_LIBDIR, SWFED_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(gif, $PHP_GIF_DIR/$PHP_LIBDIR, SWFED_SHARED_LIBADD) else dnl PHP4 - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_GIF_DIR/lib, SWFED_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(gif, $PHP_GIF_DIR/lib, SWFED_SHARED_LIBADD) fi PHP_ADD_INCLUDE($PHP_GIF_INCDIR) fi Modified: trunk/src/config.m4 =================================================================== --- trunk/src/config.m4 2010-03-15 14:56:28 UTC (rev 186) +++ trunk/src/config.m4 2010-04-20 01:09:36 UTC (rev 187) @@ -59,7 +59,7 @@ dnl -L$SWFED_DIR/lib -lm -ldl dnl ]) dnl - dnl PHP_SUBST(SWFED_SHARED_LIBADD) + PHP_SUBST(SWFED_SHARED_LIBADD) PHP_NEW_EXTENSION(swfed, swfed.c \ swf_object.c swf_header.c swf_tag.c bitstream.c swf_debug.c \ From svnnotify ＠ sourceforge.jp Tue Apr 20 11:13:00 2010 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Apr 2010 11:13:00 +0900 Subject: [Swfed-svn] =?utf-8?q?swfed-svn_=5B188=5D__ruby_=E3=81=AE_plugin_?= =?utf-8?b?44KC5L2c44Gj44Gm44G/44Gf44GE44Kt44Oi44OB44KS6KGo44GZ54K6?= Message-ID: <1271729580.078898.27267.nullmailer@users.sourceforge.jp> Revision: 188 http://sourceforge.jp/projects/swfed/svn/view?view=rev&revision=188 Author: yoya Date: 2010-04-20 11:12:59 +0900 (Tue, 20 Apr 2010) Log Message: ----------- ruby の plugin も作ってみたいキモチを表す為 Added Paths: ----------- trunk/ruby/ trunk/ruby/Makefile trunk/ruby/extconf.rb trunk/ruby/swfed.c -------------- next part -------------- Added: trunk/ruby/Makefile =================================================================== --- trunk/ruby/Makefile (rev 0) +++ trunk/ruby/Makefile 2010-04-20 02:12:59 UTC (rev 188) @@ -0,0 +1,181 @@ + +SHELL = /bin/sh + +#### Start of system configuration section. #### + +srcdir = . +topdir = /usr/local/include/ruby-1.9.1 +hdrdir = /usr/local/include/ruby-1.9.1 +arch_hdrdir = /usr/local/include/ruby-1.9.1/$(arch) +VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby +prefix = $(DESTDIR)/usr/local +exec_prefix = $(prefix) +vendorhdrdir = $(rubyhdrdir)/vendor_ruby +sitehdrdir = $(rubyhdrdir)/site_ruby +rubyhdrdir = $(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version) +vendordir = $(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby +sitedir = $(libdir)/$(RUBY_INSTALL_NAME)/site_ruby +mandir = $(datarootdir)/man +localedir = $(datarootdir)/locale +libdir = $(exec_prefix)/lib +psdir = $(docdir) +pdfdir = $(docdir) +dvidir = $(docdir) +htmldir = $(docdir) +infodir = $(datarootdir)/info +docdir = $(datarootdir)/doc/$(PACKAGE) +oldincludedir = $(DESTDIR)/usr/include +includedir = $(prefix)/include +localstatedir = $(prefix)/var +sharedstatedir = $(prefix)/com +sysconfdir = $(prefix)/etc +datadir = $(datarootdir) +datarootdir = $(prefix)/share +libexecdir = $(exec_prefix)/libexec +sbindir = $(exec_prefix)/sbin +bindir = $(exec_prefix)/bin +rubylibdir = $(libdir)/$(ruby_install_name)/$(ruby_version) +archdir = $(rubylibdir)/$(arch) +sitelibdir = $(sitedir)/$(ruby_version) +sitearchdir = $(sitelibdir)/$(sitearch) +vendorlibdir = $(vendordir)/$(ruby_version) +vendorarchdir = $(vendorlibdir)/$(sitearch) + +CC = gcc +CXX = g++ +LIBRUBY = $(LIBRUBY_A) +LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a +LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME) +LIBRUBYARG_STATIC = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static +OUTFLAG = -o +COUTFLAG = -o + +RUBY_EXTCONF_H = +cflags = $(optflags) $(debugflags) $(warnflags) +optflags = -O2 +debugflags = -g +warnflags = -Wall -Wno-parentheses +CFLAGS = -fPIC $(cflags) +INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir) +DEFS = -D_FILE_OFFSET_BITS=64 +CPPFLAGS = $(DEFS) $(cppflags) +CXXFLAGS = $(CFLAGS) $(cxxflags) +ldflags = -L. -rdynamic -Wl,-export-dynamic +dldflags = +archflag = +DLDFLAGS = $(ldflags) $(dldflags) $(archflag) +LDSHARED = $(CC) -shared +LDSHAREDXX = $(CXX) -shared +AR = ar +EXEEXT = + +RUBY_INSTALL_NAME = ruby +RUBY_SO_NAME = ruby +arch = i686-linux +sitearch = i686-linux +ruby_version = 1.9.1 +ruby = /usr/local/bin/ruby +RUBY = $(ruby) +RM = rm -f +RM_RF = $(RUBY) -run -e rm -- -rf +RMDIRS = $(RUBY) -run -e rmdir -- -p +MAKEDIRS = mkdir -p +INSTALL = /usr/bin/install -c +INSTALL_PROG = $(INSTALL) -m 0755 +INSTALL_DATA = $(INSTALL) -m 644 +COPY = cp + +#### End of system configuration section. #### + +preload = + +libpath = . $(libdir) +LIBPATH = -L. -L$(libdir) -Wl,-R$(libdir) +DEFFILE = + +CLEANFILES = mkmf.log +DISTCLEANFILES = +DISTCLEANDIRS = + +extout = +extout_prefix = +target_prefix = +LOCAL_LIBS = +LIBS = -lpthread -lrt -ldl -lcrypt -lm -lc +SRCS = swfed.c +OBJS = swfed.o +TARGET = swfed +DLLIB = $(TARGET).so +EXTSTATIC = +STATIC_LIB = + +BINDIR = $(bindir) +RUBYCOMMONDIR = $(sitedir)$(target_prefix) +RUBYLIBDIR = $(sitelibdir)$(target_prefix) +RUBYARCHDIR = $(sitearchdir)$(target_prefix) +HDRDIR = $(rubyhdrdir)/ruby$(target_prefix) +ARCHHDRDIR = $(rubyhdrdir)/$(arch)/ruby$(target_prefix) + +TARGET_SO = $(DLLIB) +CLEANLIBS = $(TARGET).so +CLEANOBJS = *.o *.bak + +all: $(DLLIB) +static: $(STATIC_LIB) + +clean-rb-default:: +clean-rb:: +clean-so:: +clean: clean-so clean-rb-default clean-rb + @-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) + +distclean-rb-default:: +distclean-rb:: +distclean-so:: +distclean: clean distclean-so distclean-rb-default distclean-rb + @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log + @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES) + @-$(RMDIRS) $(DISTCLEANDIRS) + +realclean: distclean +install: install-so install-rb + +install-so: $(RUBYARCHDIR) +install-so: $(RUBYARCHDIR)/$(DLLIB) +$(RUBYARCHDIR)/$(DLLIB): $(DLLIB) + $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR) +install-rb: pre-install-rb install-rb-default +install-rb-default: pre-install-rb-default +pre-install-rb: Makefile +pre-install-rb-default: Makefile +$(RUBYARCHDIR): + $(MAKEDIRS) $@ + +site-install: site-install-so site-install-rb +site-install-so: install-so +site-install-rb: install-rb + +.SUFFIXES: .c .m .cc .cxx .cpp .C .o + +.cc.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.cxx.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.cpp.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.C.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< + +.c.o: + $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $< + +$(DLLIB): $(OBJS) Makefile + @-$(RM) $(@) + $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS) + + + +$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h Added: trunk/ruby/extconf.rb =================================================================== --- trunk/ruby/extconf.rb (rev 0) +++ trunk/ruby/extconf.rb 2010-04-20 02:12:59 UTC (rev 188) @@ -0,0 +1,4 @@ +#!/usr/local/bin/ruby +require 'mkmf' + +create_makefile( 'swfed' ) Added: trunk/ruby/swfed.c =================================================================== --- trunk/ruby/swfed.c (rev 0) +++ trunk/ruby/swfed.c 2010-04-20 02:12:59 UTC (rev 188) @@ -0,0 +1,14 @@ +#include "ruby.h" + +VALUE swfed_swfInfo ( VALUE self ) +{ + return Qnil; +} + +void Init_swfed ( void ) +{ + VALUE c; + + c = rb_define_class( "SWFEditor", rb_cObject ); + rb_define_method( c, "swfInfo", swfed_swfInfo, 0 ); +}