From: <gof...@us...> - 2008-07-18 06:59:24
|
Revision: 5180 http://octave.svn.sourceforge.net/octave/?rev=5180&view=rev Author: goffioul Date: 2008-07-18 06:59:33 +0000 (Fri, 18 Jul 2008) Log Message: ----------- Fix FTGL compilation Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-07-18 06:44:57 UTC (rev 5179) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-07-18 06:59:33 UTC (rev 5180) @@ -1840,8 +1840,8 @@ rc -fo $@ $< EOF ) && - sed -e 's/^#ifdef WIN32$/#if defined (WIN32) || defined (_MSC_VER)/' include/FTGL.h > ttt && - mv ttt include/FTGL.h && + sed -e 's/^#ifdef WIN32$/#if defined (WIN32) || defined (_MSC_VER)/' ../include/FTGL.h > ttt && + mv ttt ../include/FTGL.h && make && make install && rm -f $tlibdir_quoted/libftgl*.la) >&5 2>&1 && end_package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-07-18 09:17:17
|
Revision: 5181 http://octave.svn.sourceforge.net/octave/?rev=5181&view=rev Author: goffioul Date: 2008-07-18 09:17:23 +0000 (Fri, 18 Jul 2008) Log Message: ----------- Add version info to GtkGLExt/GtkGLExtmm Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-07-18 06:59:33 UTC (rev 5180) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-07-18 09:17:23 UTC (rev 5181) @@ -3718,6 +3718,19 @@ post_process_libtool && sed -e "/^SUBDIRS =/ {s/docs//;}" Makefile > ttt && mv ttt Makefile && + for f in gdk gtk; do + create_module_rc GtkGLExt $gtkglextver lib${f}glext-win32-0.dll "Naofumi Yasufuk <na...@us...>" \ + "GtkGLExt - OpenGL Extension to Gtk" "Copyright \xA9 2002-`date +%Y` Naofumi Yasufuk" > ${f}/${f}glext.rc && + (cat >> ${f}/Makefile <<EOF +${f}glext.res: ${f}glext.rc + rc -fo \$@ \$< +EOF +) && + sed -e "s/^lib${f}glext_win32_[0-9]\+_[0-9]\+_la_LDFLAGS =/& -Wl,${f}glext.res/" \ + -e "s/^lib${f}glext-win32-[0-9]\+\.[0-9]\+\.la:/& ${f}glext.res/" \ + ${f}/Makefile > ttt && + mv ttt ${f}/Makefile + done make && make install && rm -f $tlibdir_quoted/libgtkglext*.la $tlibdir_quoted/libgdkglext*.la) >&5 2>&1 && end_package @@ -3760,14 +3773,19 @@ mv ttt $f done && for f in gdk gtk; do + create_module_rc GtkGLExtmm $gtkglextmmver lib${f}glextmm-win32-0.dll "Naofumi Yasufuk <na...@us...>" \ + "C++ Wrapper for GtkGLExt" "Copyright \xA9 2002-`date +%Y` Naofumi Yasufuk" > ${f}glext/${f}mm/gl/${f}glextmm.rc && (cat >> ${f}glext/${f}mm/gl/Makefile <<EOF ${f}glextmm.def: \$(lib${f}glextmm_win32_1_2_la_OBJECTS) @echo EXPORTS > \$@ @nm .libs/*.o | grep -e ' T ' | sed -e 's/.* T //' | grep -v -e '^??_[DEG]' >> \$@ + +${f}glextmm.res: ${f}glextmm.rc + rc -fo \$@ \$< EOF ) && - sed -e "s/^lib${f}glextmm_win32_1_2_la_LDFLAGS =/& -Wl,-def:${f}glextmm.def/" \ - -e "s/^lib${f}glextmm-win32-1\.2\.la:/& ${f}glextmm.def/" \ + sed -e "s/^lib${f}glextmm_win32_1_2_la_LDFLAGS =/& -Wl,-def:${f}glextmm.def -Wl,${f}glextmm.res/" \ + -e "s/^lib${f}glextmm-win32-1\.2\.la:/& ${f}glextmm.def ${f}glextmm.res/" \ ${f}glext/${f}mm/gl/Makefile > ttt && mv ttt ${f}glext/${f}mm/gl/Makefile done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-08-19 09:08:08
|
Revision: 5248 http://octave.svn.sourceforge.net/octave/?rev=5248&view=rev Author: goffioul Date: 2008-08-19 09:08:15 +0000 (Tue, 19 Aug 2008) Log Message: ----------- update Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-18 18:20:17 UTC (rev 5247) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-19 09:08:15 UTC (rev 5248) @@ -545,7 +545,7 @@ fi } -if test -z "$todo_packages"; then +if ! $do_nsi && test -z "$todo_packages"; then if test -z "$packages"; then todo_check "$tbindir/Microsoft.VC$crtver.CRT/Microsoft.VC$crtver.CRT.manifest" VC todo_check "$tbindir/f2c.exe" f2c @@ -2679,7 +2679,7 @@ create_module_rc GraphicsMagick $gmagickver libGraphicsMagickWand-1.dll "http://www.graphicsmagick.org" \ "GraphicsMagickWand - Image Processing Library" "Copyright (C) 2002-`date +%Y` GraphicsMagick Group" > wand/magickwand.rc && W_CPPFLAGS="$W_CPPFLAGS -D_VISUALC_" \ - configure_package --enable-shared --disable-static --without-perl && + configure_package --enable-shared --disable-static --without-perl --disable-installed && post_process_libtool && for f in coders/msl.c coders/url.c coders/svg.c; do sed -e "s/^# *include <win32config\.h>//g" $f > ttt && @@ -2712,7 +2712,7 @@ (cd wand && rc -fo magickwand.res magickwand.rc) && (cd Magick++/lib && rc -fo magick++.res magick++.rc) && make && - make install + make install && rm -f $tlibdir_quoted/libGraphicsMagicks*.la) >&5 2>&1 && end_package remove_package "$DOWNLOAD_DIR/GraphicsMagick-$gmagickver" if failed_package || test ! -f "$tlibdir/GraphicsMagick.lib"; then @@ -2811,22 +2811,10 @@ (cd "$DOWNLOAD_DIR/octave-$octave_version" && patch -p1 < octave.diff) fi cp mkoctfile.cc.in octave-config.cc.in "$DOWNLOAD_DIR/octave-$octave_version" - config_script="$DOWNLOAD_DIR/octave-$octave_version/configure" - if grep 'extern "C" void exit (int);' "$config_script" 2>&1 > /dev/null; then - echo "Pre-processing configure script..." - sed -e "s/'extern \"C\" void exit (int);'/'extern \"C\" __declspec(noreturn dllimport) void exit (int);' 'extern \"C\" void exit (int);'/g" "$config_script" > configure.tmp - mv configure.tmp "$config_script" - fi - #FIXME: remove this - specific to 2.9.19 version - (cd "$DOWNLOAD_DIR/octave-$octave_version" && - sed -e 's/trunc/ceil/' src/graphics.cc > ttt && - mv ttt src/graphics.cc) echo "done" fi echo -n "compiling octave... " (cd "$DOWNLOAD_DIR/octave-$octave_version" && - #sed -e 's/\(^.*SUBDIRS = .*\)doc examples$/\1 examples/' octMakefile.in > ttt && - #mv ttt octMakefile.in && if test ! -f "config.log"; then CC=cc-msvc CXX=cc-msvc CFLAGS=-O2 CXXFLAGS=-O2 NM="dumpbin -symbols" \ F77=fc-msvc FFLAGS="-O2" FC=fc-msvc FCFLAGS="-O2" AR=ar-msvc RANLIB=ranlib-msvc \ @@ -2859,13 +2847,15 @@ cp NEWS THANKS README "$octave_prefix/doc" && mkdir -p "$octave_prefix/share/info" && cp doc/interpreter/octave.info* "$octave_prefix/share/info" && - make -f octMakefile mkoctfile.exe octave-config.exe && - rm -f "$octave_prefix/bin/mkoctfile" "$octave_prefix/bin/mkoctfile-$octave_version" && - rm -f "$octave_prefix/bin/octave-config" "$octave_prefix/bin/octave-config-$octave_version" && - cp mkoctfile.exe "$octave_prefix/bin/mkoctfile.exe" && - cp mkoctfile.exe "$octave_prefix/bin/mkoctfile-$octave_version.exe" && - cp octave-config.exe "$octave_prefix/bin/octave-config.exe" && - cp octave-config.exe "$octave_prefix/bin/octave-config-$octave_version.exe" && + if test ! -f "$octave_prefix/bin/mkoctfile.exe"; then + make -f octMakefile mkoctfile.exe octave-config.exe && + rm -f "$octave_prefix/bin/mkoctfile" "$octave_prefix/bin/mkoctfile-$octave_version" && + rm -f "$octave_prefix/bin/octave-config" "$octave_prefix/bin/octave-config-$octave_version" && + cp mkoctfile.exe "$octave_prefix/bin/mkoctfile.exe" && + cp mkoctfile.exe "$octave_prefix/bin/mkoctfile-$octave_version.exe" && + cp octave-config.exe "$octave_prefix/bin/octave-config.exe" && + cp octave-config.exe "$octave_prefix/bin/octave-config-$octave_version.exe" + fi && cp octaverc.win "$octave_prefix/share/octave/$octave_version/m/startup/octaverc" ) >&5 2>&1 && end_package if failed_package || test ! -f "$INSTALL_DIR/local/octave-$octave_version/bin/octave.exe"; then @@ -4105,7 +4095,7 @@ jhandles_version=`echo "$jhandles_version" | sed -e 's/.*-\([0-9]\+\.[0-9]\+\.[0-9]\+\)$/\1/'` else echo "JHandles not found" - exit -1 + jhandles_version= fi software_root= for drive in c d; do @@ -4138,6 +4128,13 @@ octplot_prefix="#" gui_prefix="#" playrec_prefix="#" + of_prefix="#" + jhandles_prefix="#" + gm_prefix="#" + sse1_prefix="#" + sse2_prefix="#" + sse3_prefix="#" + fltk_prefix="#" if $do_octplot; then octplot_prefix= fi @@ -4147,52 +4144,79 @@ if test -f "`octave-config -p OCTFILEDIR | sed -e 's,\\\\,/,g'`/playrec.mex"; then playrec_prefix= fi + if test -n "$of_version"; then + of_prefix= + fi + if test -n "$jhandles_version"; then + jhandles_prefix= + fi + if test -f "$INSTALL_DIR/local/octave-$octave_version/libexec/octave/$octave_version/oct/i686-pc-msdosmsvc/__magick_read__.oct"; then + gm_prefix= + fi + if test -f "$INSTALL_DIR/bin/libblas_atl${atlnum}_PIIISSE1.dll"; then + sse1_prefix= + fi + if test -f "$INSTALL_DIR/bin/libblas_atl${atlnum}_P4SSE2.dll"; then + sse2_prefix= + fi + if test -f "$INSTALL_DIR/bin/libblas_atl${atlnum}_P4E32SSE3.dll"; then + sse3_prefix= + fi + if test -f "$INSTALL_DIR/local/octave-$octave_version/libexec/octave/$octave_version/oct/i686-pc-msdosmsvc/fltk_backend.oct"; then + fltk_prefix= + fi echo -n "creating octave_main.nsi... " sed -e "s/@OCTAVE_VERSION@/$octave_version/" -e "s/@VCLIBS_ROOT@/$tdir_w32/" \ -e "s/@MSYS_ROOT@/$msys_root/" -e "s/@JHANDLES_VERSION@/$jhandles_version/" \ -e "s/@SOFTWARE_ROOT@/$software_root/" -e "s/@HAVE_OCTPLOT@/$octplot_prefix/" \ -e "s/@HAVE_GUI@/$gui_prefix/" -e "s/@HAVE_PLAYREC@/$playrec_prefix/" \ - -e "s/@MSVC_CRT@/$crtver/" \ + -e "s/@MSVC_CRT@/$crtver/" -e "s/@HAVE_OCTAVE_FORGE@/$of_prefix/" \ + -e "s/@HAVE_JHANDLES@/$jhandles_prefix/" -e "s/@HAVE_OCTAVE_GRAPHICSMAGICK@/$gm_prefix/" \ + -e "s/@GMAGICKVER@/$gmagickver/g" -e "s/@HAVE_SSE1@/$sse1_prefix/" \ + -e "s/@HAVE_SSE2@/$sse2_prefix/" -e "s/@HAVE_SSE3@/$sse3_prefix/" \ + -e "s/@HAVE_FLTK_BACKEND@/$fltk_prefix/" \ octave.nsi.in > octave_main.nsi echo "done" fi - if test ! -f "octave_forge.nsi"; then - echo -n "creating octave_forge.nsi... " - echo "SectionGroup \"Main\" GRP_forge_main" > octave_forge.nsi - create_nsi_entries "$main_pkgs" "" 0 >> octave_forge.nsi - echo "SectionGroupEnd" >> octave_forge.nsi - echo "SectionGroup \"Extra\" GRP_forge_extra" >> octave_forge.nsi - create_nsi_entries "$extra_pkgs" "/o" 0 >> octave_forge.nsi - echo "SectionGroupEnd" >> octave_forge.nsi - echo "SectionGroup \"Language\" GRP_forge_lang" >> octave_forge.nsi - create_nsi_entries "$lang_pkgs" "/o" 0 >> octave_forge.nsi - echo "SectionGroupEnd" >> octave_forge.nsi - echo "SectionGroup \"Others\" GRP_forge_others" >> octave_forge.nsi - create_nsi_entries "$nonfree_pkgs" "" 0 >> octave_forge.nsi - echo "SectionGroupEnd" >> octave_forge.nsi - echo "done" + if test -n "$of_version"; then + if test ! -f "octave_forge.nsi"; then + echo -n "creating octave_forge.nsi... " + echo "SectionGroup \"Main\" GRP_forge_main" > octave_forge.nsi + create_nsi_entries "$main_pkgs" "" 0 >> octave_forge.nsi + echo "SectionGroupEnd" >> octave_forge.nsi + echo "SectionGroup \"Extra\" GRP_forge_extra" >> octave_forge.nsi + create_nsi_entries "$extra_pkgs" "/o" 0 >> octave_forge.nsi + echo "SectionGroupEnd" >> octave_forge.nsi + echo "SectionGroup \"Language\" GRP_forge_lang" >> octave_forge.nsi + create_nsi_entries "$lang_pkgs" "/o" 0 >> octave_forge.nsi + echo "SectionGroupEnd" >> octave_forge.nsi + echo "SectionGroup \"Others\" GRP_forge_others" >> octave_forge.nsi + create_nsi_entries "$nonfree_pkgs" "" 0 >> octave_forge.nsi + echo "SectionGroupEnd" >> octave_forge.nsi + echo "done" + fi + if test ! -f "octave_forge_deps.nsi"; then + echo -n "creating octave_forge_deps.nsi... " + echo "# Dependency checking" > octave_forge_deps.nsi + create_nsi_entries "$main_pkgs" "" 2 >> octave_forge_deps.nsi + create_nsi_entries "$extra_pkgs" "" 2 >> octave_forge_deps.nsi + create_nsi_entries "$lang_pkgs" "" 2 >> octave_forge_deps.nsi + create_nsi_entries "$nonfree_pkgs" "" 2 >> octave_forge_deps.nsi + echo "done" + fi + if test ! -f "octave_forge_desc.nsi"; then + echo -n "creating octave_forge_desc.nsi... " + echo " !insertmacro MUI_DESCRIPTION_TEXT \${GRP_forge_main} \"\"" > octave_forge_desc.nsi + echo " !insertmacro MUI_DESCRIPTION_TEXT \${GRP_forge_extra} \"\"" >> octave_forge_desc.nsi + echo " !insertmacro MUI_DESCRIPTION_TEXT \${GRP_forge_lang} \"\"" >> octave_forge_desc.nsi + echo " !insertmacro MUI_DESCRIPTION_TEXT \${GRP_forge_others} \"\"" >> octave_forge_desc.nsi + create_nsi_entries "$main_pkgs" "" 1 >> octave_forge_desc.nsi + create_nsi_entries "$extra_pkgs" "" 1 >> octave_forge_desc.nsi + create_nsi_entries "$lang_pkgs" "" 1 >> octave_forge_desc.nsi + create_nsi_entries "$nonfree_pkgs" "" 1 >> octave_forge_desc.nsi + echo "done" + fi fi - if test ! -f "octave_forge_deps.nsi"; then - echo -n "creating octave_forge_deps.nsi... " - echo "# Dependency checking" > octave_forge_deps.nsi - create_nsi_entries "$main_pkgs" "" 2 >> octave_forge_deps.nsi - create_nsi_entries "$extra_pkgs" "" 2 >> octave_forge_deps.nsi - create_nsi_entries "$lang_pkgs" "" 2 >> octave_forge_deps.nsi - create_nsi_entries "$nonfree_pkgs" "" 2 >> octave_forge_deps.nsi - echo "done" - fi - if test ! -f "octave_forge_desc.nsi"; then - echo -n "creating octave_forge_desc.nsi... " - echo " !insertmacro MUI_DESCRIPTION_TEXT \${GRP_forge_main} \"\"" > octave_forge_desc.nsi - echo " !insertmacro MUI_DESCRIPTION_TEXT \${GRP_forge_extra} \"\"" >> octave_forge_desc.nsi - echo " !insertmacro MUI_DESCRIPTION_TEXT \${GRP_forge_lang} \"\"" >> octave_forge_desc.nsi - echo " !insertmacro MUI_DESCRIPTION_TEXT \${GRP_forge_others} \"\"" >> octave_forge_desc.nsi - create_nsi_entries "$main_pkgs" "" 1 >> octave_forge_desc.nsi - create_nsi_entries "$extra_pkgs" "" 1 >> octave_forge_desc.nsi - create_nsi_entries "$lang_pkgs" "" 1 >> octave_forge_desc.nsi - create_nsi_entries "$nonfree_pkgs" "" 1 >> octave_forge_desc.nsi - echo "done" - fi if test ! -f "check_cpu_flag.exe"; then echo -n "creating CPU feature helper program... " cc-msvc -O2 -MT check_cpu_flag.c -luser32 -lshell32 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-08-20 14:51:32
|
Revision: 5250 http://octave.svn.sourceforge.net/octave/?rev=5250&view=rev Author: goffioul Date: 2008-08-20 14:51:38 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Add libxslt and ICU compilation + libcurl pkg-config support Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-19 15:54:59 UTC (rev 5249) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-20 14:51:38 UTC (rev 5250) @@ -38,7 +38,7 @@ verbose=false packages= -available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:" +available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:" octave_version= of_version= do_nsi=false @@ -64,6 +64,7 @@ pangover=1.19.0 ftver=2.3.5 libxml2ver=2.6.30 +libxsltver=1.1.24 fontconfigver=2.5.0 gdver=2.0.35 hdf5ver=1.6.6 @@ -582,6 +583,8 @@ todo_check "$tbindir/libglib-2.0-0.dll" glib todo_check "$tbindir/libpango-1.0-0.dll" pango todo_check "$tlibdir/xml2.lib" libxml2 + todo_check "$tlibdir/xslt.lib" libxslt + todo_check "$tlibdir/icu.lib" ICU todo_check "$tlibdir/fontconfig.lib" fontconfig todo_check "$tlibdir/freetype.lib" freetype todo_check "$tlibdir/gd.lib" libgd @@ -1750,6 +1753,98 @@ fi fi +########### +# libxslt # +########### + +if check_package libxslt; then + download_file libxslt-$libxsltver.tar.gz ftp://xmlsoft.org/libxslt/libxslt-$libxsltver.tar.gz + echo -n "decompressing libxslt... " + unpack_file libxslt-$libxsltver.tar.gz + echo "done" + echo "compiling libxslt... " + (cd "$DOWNLOAD_DIR/libxslt-$libxsltver" && + create_module_rc libxslt $libxsltver "libxslt-1.dll" "XmlSoft (www.xmlsoft.org)" \ + "XSL Transformation Library" "`grep -e '^ *Copyright' Copyright | head -n 1 | sed -e 's/^ *//'`" > xslt.rc && + sed -e '/#undef vsnprintf/ {i \ +#ifndef HAVE_VSNPRINTF\ +#undef vsnprintf\ +#endif +;d;}' \ + config.h.in > ttt && + mv ttt config.h.in && + configure_package --enable-shared --disable-static && + post_process_libtool && + sed -e "s/^libxslt_la_LDFLAGS =/& -no-undefined -Wl,../xslt.res/" libxslt/Makefile > ttt && + mv ttt libxslt/Makefile && + sed -e "s/^libexslt_la_LDFLAGS =/& -no-undefined -Wl,../xslt.res/" libexslt/Makefile > ttt && + mv ttt libexslt/Makefile && + sed -e 's/doc \\/ \\/' Makefile > ttt && + mv ttt Makefile && + rc -fo xslt.res xslt.rc && + make && + make install && + rm -f $tlibdir_quoted/libxslt.la $tlibdir_quoted/libexslt.la) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/libxslt-$libxsltver" + if failed_package || test ! -f "$tlibdir/xslt.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + +####### +# ICU # +####### + +if check_package ICU; then + download_file icu4c-4_0-src.tgz http://download.icu-project.org/files/icu4c/4.0/icu4c-4_0-src.tgz + echo -n "decompressing ICU... " + unpack_file icu4c-4_0-src.tgz + echo "done" + echo "compiling ICU... " + (cd "$DOWNLOAD_DIR/icu/source" && + sed -e 's,/MD,-MD,g' configure > ttt && + mv ttt configure && + sed -e 's,/O2,-O2,g' \ + -e 's,/Ob2,-Ob2,g' \ + -e 's,/Zi,-Zi,g' \ + -e 's,/DEBUG,-DEBUG,g' \ + runConfigureICU > ttt && + mv ttt runConfigureICU && + sed -e 's/^LIBICU =/#&/' -e 's,/GF,-GF,' -e 's,/nologo,-nologo,' \ + -e 's,/EHsc,-EHsc,' -e 's,/Zc,-Zc,' -e 's,/subsystem,-subsystem,' \ + -e 's,/DLL,-DLL,' -e 's,/IMPLIB,-IMPLIB,' -e 's,/out,-out,' \ + -e 's,/OUT,-OUT,' -e 's,/base,-base,' -e 's,/Fo,-Fo,' -e 's,/fo,-fo,' \ + -e 's,/c$,-c,' -e 's/^LIBPREFIX=$/& lib/' \ + -e 's/cygpath -[a-z]* \./cd . && pwd -W/' \ + -e 's/cygpath -[a-z]* \(.*\))#M#/cd \1 && pwd -W/' \ + config/mh-cygwin-msvc > ttt && + mv ttt config/mh-cygwin-msvc && + sed -e 's/LIB_PREFIX ""/LIB_PREFIX "lib"/' tools/pkgdata/pkgtypes.h > ttt && + mv ttt tools/pkgdata/pkgtypes.h && + sed -e 's/\$(LIBNAME)/" LIB_PREFIX "&/' tools/pkgdata/winmode.c > ttt && + mv ttt tools/pkgdata/winmode.c && + ./runConfigureICU Cygwin/MSVC2005 --prefix=$tdir_w32_forward --includedir=$tdir_w32_forward/include/icu \ + --disable-static --enable-shared && + make && + make install && + for f in find $tdir_w32_forward/lib/libicu*40.dll; do + mv $f $tdir_w32_forward/bin + done && + rm -f $tdir_w32_forward/lib/libicu*.dll && + for f in find $tdir_w32_forward/lib/libicu*.lib; do + mv $f $tdir_w32_forward/lib/`basename $f | sed -e 's/^lib//'` + done) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/icu" + if failed_package || test ! -f "$tlibdir/icuuc.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi ############ # freetype # ############ @@ -2466,8 +2561,19 @@ done nmake VC=vc8 vc-dll-zlib-dll && mt -outputresource:lib\\libcurl.dll -manifest lib\\release-dll-zlib-dll\\libcurl.dll.manifest && + sed -e "s,@prefix@,$tdir_w32_forward," \ + -e 's,@exec_prefix@,${prefix},' \ + -e 's,@includedir@,${prefix}/include,' \ + -e 's,@libdir@,${prefix}/lib,' \ + -e "s,@VERSION@,$curlver," \ + -e "s,@LDFLAGS@,," \ + -e "s,@LIBS@,-lz," \ + -e "s,@LIBCURL_LIBS@,," \ + -e 's,-lcurl,-llibcurl,' \ + libcurl.pc.in > libcurl.pc && cp lib/libcurl.dll "$tbindir" && cp lib/libcurl.lib "$tlibdir" && + cp libcurl.pc "$tlibdir/pkgconfig/libcurl.pc" && cp COPYING "$tlicdir/COPYING.CURL" && mkdir -p "$tincludedir/curl" && cp include/curl/*.h "$tincludedir/curl") >&5 2>&1 && end_package remove_package "$DOWNLOAD_DIR/curl-$curlver" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-08-21 20:20:37
|
Revision: 5255 http://octave.svn.sourceforge.net/octave/?rev=5255&view=rev Author: goffioul Date: 2008-08-21 20:20:46 +0000 (Thu, 21 Aug 2008) Log Message: ----------- compilation fixes for libxslt and ICU Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-21 17:36:03 UTC (rev 5254) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-21 20:20:46 UTC (rev 5255) @@ -1775,9 +1775,9 @@ mv ttt config.h.in && configure_package --enable-shared --disable-static && post_process_libtool && - sed -e "s/^libxslt_la_LDFLAGS =/& -no-undefined -Wl,../xslt.res/" libxslt/Makefile > ttt && + sed -e 's,^libxslt_la_LDFLAGS =,& -no-undefined -Wl\,../xslt.res,' libxslt/Makefile > ttt && mv ttt libxslt/Makefile && - sed -e "s/^libexslt_la_LDFLAGS =/& -no-undefined -Wl,../xslt.res/" libexslt/Makefile > ttt && + sed -e 's,^libexslt_la_LDFLAGS =,& -no-undefined -Wl\,../xslt.res,' libexslt/Makefile > ttt && mv ttt libexslt/Makefile && sed -e 's/doc \\/ \\/' Makefile > ttt && mv ttt Makefile && @@ -1817,16 +1817,18 @@ -e 's,/EHsc,-EHsc,' -e 's,/Zc,-Zc,' -e 's,/subsystem,-subsystem,' \ -e 's,/DLL,-DLL,' -e 's,/IMPLIB,-IMPLIB,' -e 's,/out,-out,' \ -e 's,/OUT,-OUT,' -e 's,/base,-base,' -e 's,/Fo,-Fo,' -e 's,/fo,-fo,' \ - -e 's,/c$,-c,' -e 's/^LIBPREFIX=$/& lib/' \ - -e 's/cygpath -[a-z]* \./cd . && pwd -W/' \ - -e 's/cygpath -[a-z]* \(.*\))#M#/cd \1 && pwd -W/' \ + -e 's,/c$,-c,' -e 's,/NOENTRY,-NOENTRY,' -e 's/^LIBPREFIX=$/& lib/' \ + -e 's/cygpath -[a-z]* \./cd . \&\& pwd -W/' \ + -e 's/cygpath -[a-z]* \(.*\))#M#/cd \1 \&\& pwd -W)#M#/' \ config/mh-cygwin-msvc > ttt && mv ttt config/mh-cygwin-msvc && sed -e 's/LIB_PREFIX ""/LIB_PREFIX "lib"/' tools/pkgdata/pkgtypes.h > ttt && mv ttt tools/pkgdata/pkgtypes.h && sed -e 's/\$(LIBNAME)/" LIB_PREFIX "&/' tools/pkgdata/winmode.c > ttt && mv ttt tools/pkgdata/winmode.c && - ./runConfigureICU Cygwin/MSVC2005 --prefix=$tdir_w32_forward --includedir=$tdir_w32_forward/include/icu \ + sed -e '/rc\.exe/ {s,/i,-i,; s,/fo,-fo,;}' data/Makefile.in > ttt && + mv ttt data/Makefile.in && + ./runConfigureICU Cygwin/MSVC2005 --prefix=$tdir_w32_forward \ --disable-static --enable-shared && make && make install && This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-08-25 05:55:27
|
Revision: 5268 http://octave.svn.sourceforge.net/octave/?rev=5268&view=rev Author: goffioul Date: 2008-08-25 05:55:37 +0000 (Mon, 25 Aug 2008) Log Message: ----------- Add SQLite3 pkg-config file generation Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-25 05:55:17 UTC (rev 5267) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-25 05:55:37 UTC (rev 5268) @@ -3137,6 +3137,19 @@ ;}' sqlite3.h > ttt && mv ttt sqlite3.h && make install-libLTLIBRARIES install-includeHEADERS && + (cat > "$tlibdir/pkgconfig/sqlite3.pc" << EOF +prefix=$tdir_w32_forward +exec_prefix=\${prefix} +libdir=\${exec_prefix}/lib +includedir=\${prefix}/include + +Name: sqlite3 +Description: SQLite3 - Lightweight SQL Library +Version: $sqlite3ver +Libs: -L\${libdir} -lsqlite3 +Cflags: -I\${includedir} +EOF +) && rm -f $tlibdir_quoted/libsqlite3*.la) >&5 2>&1 && end_package remove_package "$DOWNLOAD_DIR/sqlite-$sqlite3ver" if failed_package || test ! -f "$tlibdir/sqlite3.lib"; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-08-25 15:13:28
|
Revision: 5271 http://octave.svn.sourceforge.net/octave/?rev=5271&view=rev Author: goffioul Date: 2008-08-25 15:13:29 +0000 (Mon, 25 Aug 2008) Log Message: ----------- Add inttypes and pthread compilation + move cairo after fontconfig + add skeleton for webkit compilation Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-25 06:37:42 UTC (rev 5270) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-25 15:13:29 UTC (rev 5271) @@ -38,7 +38,7 @@ verbose=false packages= -available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:" +available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:pthreads:inttypes:webkit:" octave_version= of_version= do_nsi=false @@ -93,6 +93,7 @@ ftglver=2.1.2 gtkglextver=1.2.0 gtkglextmmver=1.2.0 +pthreadsver=2.8.0 ################################################################################### @@ -579,8 +580,8 @@ todo_check "$tlibdir/jpeg.lib" libjpeg todo_check "$tlibdir/iconv.lib" libiconv todo_check "$tlibdir/intl.lib" gettext + todo_check "$tbindir/libglib-2.0-0.dll" glib todo_check "$tbindir/libcairo-2.dll" cairo - todo_check "$tbindir/libglib-2.0-0.dll" glib todo_check "$tbindir/libpango-1.0-0.dll" pango todo_check "$tlibdir/xml2.lib" libxml2 todo_check "$tlibdir/xslt.lib" libxslt @@ -640,6 +641,11 @@ todo_check "$tlibdir/ftgl.lib" FTGL todo_check "$tlibdir/gtkglext-win32-1.0.lib" gtkglext todo_check "$tlibdir/gtkglextmm-win32-1.2-0.lib" gtkglextmm + todo_check "$tlibdir/pthread.lib" pthreads + todo_check "$tincludedir/stdint.h" inttypes + todo_check "$tincludedir/inttypes.h" inttypes + todo_check "$tincludedir/stdbool.h" inttypes + todo_check "$tlibdir/webkit.lib" webkit fi else packages="$todo_packages" @@ -717,6 +723,48 @@ fi fi +############ +# inttypes # +############ + +if check_package inttypes; then + download_file inttypes.h http://msinttypes.googlecode.com/svn/trunk/inttypes.h + download_file stdint.h http://msinttypes.googlecode.com/svn/trunk/stdint.h + if test ! -f "$DOWNLOAD_DIR/stdbool.h"; then + echo -n "creating stdbool.h..." + (cat > "$DOWNLOAD_DIR/stdbool.h" <<EOF +#ifndef __stdbool_h__ +#define __stdbool_h__ 1 + +#ifndef __cplusplus + +#define __bool_true_false_are_defined 1 + +#define false 0 +#define true 1 + +#define bool _Bool +typedef unsigned char _Bool; + +#endif /* __cplusplus */ + +#endif /* __stdbool_h__ */ +EOF +) + echo "done" + fi + (cd "$DOWNLOAD_DIR" && + cp inttypes.h "$tincludedir/inttypes.h" + cp stdint.h "$tincludedir/stdint.h" + cp stdbool.h "$tincludedir/stdbool.h") >&5 2>&1 && end_package + if failed_package || test ! -f "$tincludedir/inttypes.h"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + ####### # f2c # ####### @@ -897,6 +945,33 @@ fi fi +########### +# pthread # +########### + +if check_package pthreads; then + ptwver=`echo $pthreadsver | sed -e 's,\.,-,g'` + download_file pthreads-w32-$ptwver-release.tar.gz ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-$ptwver-release.tar.gz + echo -n "decompressing pthreads... " + unpack_file pthreads-w32-$ptwver-release.tar.gz + echo "done" + echo -n "compiling pthreads... " + (cd "$DOWNLOAD_DIR/pthreads-w32-$ptwver-release" && + sed -e 's/pthreadVC\$(DLL_VER)\.stamp/libpthread-$(DLL_VER)\.stamp/g' Makefile > ttt && + mv ttt Makefile && + nmake clean VC-inlined && + cp libpthread-*.dll "$tbindir" && + cp libpthread-*.lib "$tlibdir/pthread.lib" && + cp pthread.h sched.h semaphore.h "$tincludedir") >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/pthreads-w32-$ptwver-release" + if failed_package || test ! -f "$tlibdir/pthread.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + ######## # PCRE # ######## @@ -1627,39 +1702,6 @@ fi fi -######### -# cairo # -######### - -if check_package cairo; then - download_file cairo-$cairover.tar.gz http://cairographics.org/releases/cairo-$cairover.tar.gz - echo -n "decompressing cairo... " - (cd "$DOWNLOAD_DIR" && if ! tar xfz cairo-$cairover.tar.gz; then tar xf cairo-$cairover.tar.gz; fi) - echo "done" - echo "compiling cairo... " - (cd "$DOWNLOAD_DIR/cairo-$cairover" && - ax_cv_c_float_words_bigendian=no configure_package --enable-shared --disable-static && - post_process_libtool && - sed -e "s|^libcairo_la_LDFLAGS =|libcairo_la_LDFLAGS = -Wl,cairo.res|" \ - -e "s|^libcairo_la_OBJECTS =|libcairo_la_OBJECTS = cairo.res|" \ - -e "s|-lgdi32|-luser32 -lgdi32|" src/Makefile > ttt && - mv ttt src/Makefile && - echo "cairo.res: cairo.rc" >> src/Makefile && - echo " rc -fo \$@ \$<" >> src/Makefile && - create_module_rc Cairo $cairover libcairo-2.dll "Freedesktop.org <www.freedesktop.org>" \ - "`grep -e '^Cairo -' README | head -n 1`" "Copyright \xA9 `date +%Y` Freedesktop.org" > src/cairo.rc && - make && - make install && - rm -f $tlibdir_quoted/libcairo*.la) >&5 2>&1 && end_package - remove_package "$DOWNLOAD_DIR/cairo-$cairover" - if failed_package || test ! -f "$tbindir/libcairo-2.dll"; then - echo "failed" - exit -1 - else - echo "done" - fi -fi - ######## # glib # ######## @@ -1984,6 +2026,39 @@ fi ######### +# cairo # +######### + +if check_package cairo; then + download_file cairo-$cairover.tar.gz http://cairographics.org/releases/cairo-$cairover.tar.gz + echo -n "decompressing cairo... " + (cd "$DOWNLOAD_DIR" && if ! tar xfz cairo-$cairover.tar.gz; then tar xf cairo-$cairover.tar.gz; fi) + echo "done" + echo "compiling cairo... " + (cd "$DOWNLOAD_DIR/cairo-$cairover" && + ax_cv_c_float_words_bigendian=no configure_package --enable-shared --disable-static && + post_process_libtool && + sed -e "s|^libcairo_la_LDFLAGS =|libcairo_la_LDFLAGS = -Wl,cairo.res|" \ + -e "s|^libcairo_la_OBJECTS =|libcairo_la_OBJECTS = cairo.res|" \ + -e "s|-lgdi32|-luser32 -lgdi32|" src/Makefile > ttt && + mv ttt src/Makefile && + echo "cairo.res: cairo.rc" >> src/Makefile && + echo " rc -fo \$@ \$<" >> src/Makefile && + create_module_rc Cairo $cairover libcairo-2.dll "Freedesktop.org <www.freedesktop.org>" \ + "`grep -e '^Cairo -' README | head -n 1`" "Copyright \xA9 `date +%Y` Freedesktop.org" > src/cairo.rc && + make && + make install && + rm -f $tlibdir_quoted/libcairo*.la) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/cairo-$cairover" + if failed_package || test ! -f "$tbindir/libcairo-2.dll"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + +######### # pango # ######### @@ -3912,6 +3987,33 @@ fi fi +########## +# webkit # +########## + +if check_package webkit; then + download_file webkit-1.0.1.tar.gz http://people.freedesktop.org/~alp/webkit/gtk/webkit-1.0.1.tar.gz + download_file "webkit-cairo-canvas-r34625-for-1.0.1.patch" "http://people.freedesktop.org/~alp/webkit/gtk/webkit-cairo-canvas-r34625-for-1.0.1.patch" + echo -n "decompressing webkit... " + unpack_file webkit-1.0.1.tar.gz + cp "$DOWNLOAD_DIR/webkit-cairo-canvas-r34625-for-1.0.1.patch" "$DOWNLOAD_DIR/webkit-1.0.1/webkit-cairo-canvas-r34625-for-1.0.1.patch" + echo "done" + echo -n "compiling webkit... " + (cd "$DOWNLOAD_DIR/webkit-1.0.1" && + patch -p1 < "webkit-cairo-canvas-r34625-for-1.0.1.patch" && + W_CPPFLAGS="$W_CPPFLAGS -D_WINDOWS -D__PRODUCTION__=0 -D_UNICODE -DUNICODE -D__STD_C" \ + configure_package --build=i686-pc-mingw32 --with-target=win32 && + false + ) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/webkit-1.0.1" + if failed_package || test ! -f "$tlibdir/webkit.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + ############ # OctaveDE # ############ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-08-26 10:22:47
|
Revision: 5273 http://octave.svn.sourceforge.net/octave/?rev=5273&view=rev Author: goffioul Date: 2008-08-26 10:22:55 +0000 (Tue, 26 Aug 2008) Log Message: ----------- Finalize webkitgtk compilation Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-25 19:43:56 UTC (rev 5272) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-26 10:22:55 UTC (rev 5273) @@ -1880,7 +1880,9 @@ rm -f $tdir_w32_forward/lib/libicu*.dll && for f in find $tdir_w32_forward/lib/libicu*.lib; do mv $f $tdir_w32_forward/lib/`basename $f | sed -e 's/^lib//'` - done) >&5 2>&1 && end_package + done && + sed -e 's,unicode/pwin32\.h,unicode/platform.h,' "$tincludedir/unicode/umachine.h" > ttt && + mv ttt "$tincludedir/unicode/umachine.h") >&5 2>&1 && end_package remove_package "$DOWNLOAD_DIR/icu" if failed_package || test ! -f "$tlibdir/icuuc.lib"; then echo "failed" @@ -3992,25 +3994,36 @@ ########## if check_package webkit; then - download_file webkit-1.0.1.tar.gz http://people.freedesktop.org/~alp/webkit/gtk/webkit-1.0.1.tar.gz - download_file "webkit-cairo-canvas-r34625-for-1.0.1.patch" "http://people.freedesktop.org/~alp/webkit/gtk/webkit-cairo-canvas-r34625-for-1.0.1.patch" - echo -n "decompressing webkit... " - unpack_file webkit-1.0.1.tar.gz - cp "$DOWNLOAD_DIR/webkit-cairo-canvas-r34625-for-1.0.1.patch" "$DOWNLOAD_DIR/webkit-1.0.1/webkit-cairo-canvas-r34625-for-1.0.1.patch" - echo "done" - echo -n "compiling webkit... " - (cd "$DOWNLOAD_DIR/webkit-1.0.1" && - patch -p1 < "webkit-cairo-canvas-r34625-for-1.0.1.patch" && - W_CPPFLAGS="$W_CPPFLAGS -D_WINDOWS -D__PRODUCTION__=0 -D_UNICODE -DUNICODE -D__STD_C" \ - configure_package --build=i686-pc-mingw32 --with-target=win32 && - false - ) >&5 2>&1 && end_package - remove_package "$DOWNLOAD_DIR/webkit-1.0.1" - if failed_package || test ! -f "$tlibdir/webkit.lib"; then - echo "failed" + if perl -e "use 5.8.0;" >& /dev/null; then + download_file webkit-1.0.1.tar.gz http://people.freedesktop.org/~alp/webkit/gtk/webkit-1.0.1.tar.gz + download_file "webkit-cairo-canvas-r34625-for-1.0.1.patch" "http://people.freedesktop.org/~alp/webkit/gtk/webkit-cairo-canvas-r34625-for-1.0.1.patch" + echo -n "decompressing webkit... " + unpack_file webkit-1.0.1.tar.gz + cp "$DOWNLOAD_DIR/webkit-cairo-canvas-r34625-for-1.0.1.patch" "$DOWNLOAD_DIR/webkit-1.0.1/webkit-cairo-canvas-r34625-for-1.0.1.patch" + cp libs/webkit-1.0.1.diff "$DOWNLOAD_DIR/webkit-1.0.1/webkit-1.0.1.diff" + echo "done" + echo -n "compiling webkit... " + (cd "$DOWNLOAD_DIR/webkit-1.0.1" && + patch -p1 < "webkit-cairo-canvas-r34625-for-1.0.1.patch" && + patch -p1 < webkit-1.0.1.diff && + ./autogen.sh && + W_CPPFLAGS="$W_CPPFLAGS -D_WINDOWS -D__PRODUCTION__=0 -D_UNICODE -DUNICODE -D__STD_C" \ + configure_package --build=i686-pc-mingw32 --with-target=win32 && + post_process_libtool && + read -p "WARNING: libtool needs manual post-processing; press <ENTER> when done " && + make libwebkit-1.0.al && + make install-libLTLIBRARIES install-data-am && + rm -f $tlibdir_quoted/libwebkit-*.la) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/webkit-1.0.1" + if failed_package || test ! -f "$tlibdir/webkit.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi + else + echo "ERROR: perl >= 5.8.0 is needed to compile webkit" exit -1 - else - echo "done" fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-08-27 12:28:30
|
Revision: 5280 http://octave.svn.sourceforge.net/octave/?rev=5280&view=rev Author: goffioul Date: 2008-08-27 12:28:38 +0000 (Wed, 27 Aug 2008) Log Message: ----------- Fix webkit compilation + Add Xapian compilation Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-27 09:44:18 UTC (rev 5279) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-08-27 12:28:38 UTC (rev 5280) @@ -38,7 +38,7 @@ verbose=false packages= -available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:pthreads:inttypes:webkit:" +available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:pthreads:inttypes:webkit:xapian:" octave_version= of_version= do_nsi=false @@ -94,6 +94,7 @@ gtkglextver=1.2.0 gtkglextmmver=1.2.0 pthreadsver=2.8.0 +xapianver=1.0.7 ################################################################################### @@ -646,6 +647,7 @@ todo_check "$tincludedir/inttypes.h" inttypes todo_check "$tincludedir/stdbool.h" inttypes todo_check "$tlibdir/webkit.lib" webkit + todo_check "$tlibdir/xapian.lib" xapian fi else packages="$todo_packages" @@ -4008,10 +4010,10 @@ patch -p1 < webkit-1.0.1.diff && ./autogen.sh && W_CPPFLAGS="$W_CPPFLAGS -D_WINDOWS -D__PRODUCTION__=0 -D_UNICODE -DUNICODE -D__STD_C" \ - configure_package --build=i686-pc-mingw32 --with-target=win32 && + configure_package --build=i686-pc-mingw32 --with-target=win32 --with-font-backend=pango && post_process_libtool && read -p "WARNING: libtool needs manual post-processing; press <ENTER> when done " && - make libwebkit-1.0.al && + make libwebkit-1.0.la && make install-libLTLIBRARIES install-data-am && rm -f $tlibdir_quoted/libwebkit-*.la) >&5 2>&1 && end_package remove_package "$DOWNLOAD_DIR/webkit-1.0.1" @@ -4027,6 +4029,61 @@ fi fi +########## +# xapian # +########## + +if check_package xapian; then + download_file xapian-core-$xapianver.tar.gz http://oligarchy.co.uk/xapian/$xapianver/xapian-core-$xapianver.tar.gz + echo -n "decompression xapian... " + unpack_file xapian-core-$xapianver.tar.gz + echo "done" + echo "compiling xapian... " + (cd "$DOWNLOAD_DIR/xapian-core-$xapianver" && + create_module_rc Xapian $xapianver libxapian.dll "http://xapian.org" \ + "Xapian - Search Engine Library" "Copyright (c) `date +%Y` http://xapian.org" > xapian.rc && + configure_package --disable-static && + post_process_libtool && + sed -e '/^#else/ {i \ +#elif defined (_MSC_VER)\ +# if defined (XAPIAN_INTERNAL)\ +# define XAPIAN_VISIBILITY_DEFAULT __declspec(dllexport)\ +# else\ +# define XAPIAN_VISIBILITY_DEFAULT __declspec(dllimport)\ +# endif +}' \ + include/xapian/visibility.h > ttt && + mv ttt include/xapian/visibility.h && + sed -e 's/libxapian_la_LDFLAGS =/& -Wl,xapian.res/' \ + -e '/^libxapian_la_OBJECTS =.*$/ {a \ +\ +$(libxapian_la_OBJECTS): AM_CPPFLAGS += -DXAPIAN_INTERNAL\ + +}' \ + Makefile > ttt && + mv ttt Makefile && + sed -e 's/string om_tostring(__int64 .*);/XAPIAN_VISIBILITY_DEFAULT &/' common/utils.h > ttt && + mv ttt common/utils.h && + sed -e 's/class \(.*::Internal\) :/class XAPIAN_VISIBILITY_DEFAULT \1 :/' common/database.h > ttt && + mv ttt common/database.h && + sed -e '/^namespace Xapian {.*$/ {a \ +Weight::Weight (const Weight&) { } +}' \ + matcher/weight.cc > ttt && + mv ttt matcher/weight.cc && + rc -fo xapian.res xapian.rc && + make && + make install && + rm -f $tlibdir_quoted/libxapian*.la) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/xapian-core-$xapianver" + if failed_package || test ! -f "$tlibdir/xapian.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + ############ # OctaveDE # ############ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-09-22 13:41:38
|
Revision: 5305 http://octave.svn.sourceforge.net/octave/?rev=5305&view=rev Author: goffioul Date: 2008-09-22 13:41:19 +0000 (Mon, 22 Sep 2008) Log Message: ----------- Add compilation of libgpg-error and libgcrypt Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-09-22 05:48:20 UTC (rev 5304) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-09-22 13:41:19 UTC (rev 5305) @@ -38,7 +38,7 @@ verbose=false packages= -available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:pthreads:inttypes:webkit:xapian:" +available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:pthreads:inttypes:webkit:xapian:libgpg-error:libgcrypt:" octave_version= of_version= do_nsi=false @@ -95,6 +95,8 @@ gtkglextmmver=1.2.0 pthreadsver=2.8.0 xapianver=1.0.7 +libgpgerrver=1.6 +libgcryptver=1.4.3 ################################################################################### @@ -618,7 +620,7 @@ todo_check "$tlibdir/qhull.lib" qhull todo_check "$tbindir/pkg-config.exe" pkg-config todo_check "$tbindir/fc-msvc.exe" fc-msvc - todo_check "$tbindir/libcurl.dll" libcurl + todo_check "$tlibdir/curl.lib" libcurl todo_check "$tlibdir/bz2.lib" bzip2 #todo_check "$tlibdir/GraphicsMagick.lib" GraphicsMagick todo_check "$tlibdir/Magick.lib" ImageMagick @@ -648,6 +650,8 @@ todo_check "$tincludedir/stdbool.h" inttypes todo_check "$tlibdir/webkit.lib" webkit todo_check "$tlibdir/xapian.lib" xapian + todo_check "$tlibdir/gpg-error.lib" libgpg-error + todo_check "$tlibdir/gcrypt.lib" libgcrypt fi else packages="$todo_packages" @@ -2619,6 +2623,128 @@ fi fi +################ +# libgpg-error # +################ + +if check_package libgpg-error; then + download_file libgpg-error-$libgpgerrver.tar.bz2 "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$libgpgerrver.tar.bz2" + echo -n "decompressing libgpg-error... " + unpack_file libgpg-error-$libgpgerrver.tar.bz2 + echo "done" + echo -n "compiling libgpg-error... " + (cd "$DOWNLOAD_DIR/libgpg-error-$libgpgerrver" && + configure_package --enable-shared --disable-static && + post_process_libtool && + sed -e 's/__inline__/__inline/g' src/w32-gettext.c > ttt && + mv ttt src/w32-gettext.c && + sed -e 's/-Wl,\$(gpg_error_res)/-Wl,.libs\/$(gpg_error_res)/' \ + -e 's/^LIBS =/& -ladvapi32/' \ + src/Makefile > ttt && + mv ttt src/Makefile && + sed -e 's/snprintf/_snprintf/' src/strerror.c > ttt && + mv ttt src/strerror.c && + sed -e 's/strcasecmp/stricmp/' \ + -e 's/strncasecmp/strnicmp/' \ + src/gpg-error.c > ttt && + mv ttt src/gpg-error.c && + make && + make install) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/libgpg-error-$libgpgerrver" + if failed_package || test ! -f "$tlibdir/gpg-error.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + +############# +# libgcrypt # +############# + +if check_package libgcrypt; then + download_file libgcrypt-$libgcryptver.tar.bz2 "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$libgcryptver.tar.bz2" + echo -n "decompressing libgcrypt... " + unpack_file libgcrypt-$libgcryptver.tar.bz2 + echo "done" + echo -n "compiling libgcrypt... " + (cd "$DOWNLOAD_DIR/libgcrypt-$libgcryptver" && + sed -e '/^.*# *include <ws2tcpip.h>.*$/ {i \ +#include <winsock2.h> +}' \ + configure > ttt && + mv ttt configure && + configure_package --enable-shared --disable-static --disable-asm && + post_process_libtool && + sed -e '/#include <sys\/time\.h>/ {i \ +#ifndef _WIN32 +p;i \ +#else \ +#ifndef HAVE_SSIZE_T \ +typedef int ssize_t; \ +#define HAVE_SSIZE_T 1 \ +#endif \ +#ifndef HAVE_PID_T \ +typedef int pid_t; \ +#define HAVE_PID_T 1 \ +#endif \ +#endif +}' \ + src/gcrypt.h > ttt && + mv ttt src/gcrypt.h && + sed -e 's/S_IRUSR/S_IREAD/' \ + -e 's/S_IWUSR/S_IWRITE/' \ + -e 's/#include <sys\/time\.h>/ {i \ +#ifndef _WIN32 +p;i \ +#endif +}' \ + random/random-csprng.c > ttt && + mv ttt random/random-csprng.c && + sed -e '/#include <windows\.h>/ {i \ +#include <winsock2.h> +}' \ + src/rndw32.c > ttt && + mv ttt src/rndw32.c && + sed -e '/#include <windows\.h>/ {i \ +#include <winsock2.h> +}' \ + tests/benchmark.c > ttt && + mv ttt tests/benchmark.c && + sed -e '/#include "ath\.h"/ {i \ +#include "g10lib.h" +}' \ + -e '/#include "g10lib.h"/q' \ + src/secmem.c > ttt && + mv ttt src/secmem.c && + sed -e 's/F_OK/0/' src/fips.c > ttt && + mv ttt src/fips.c && + sed -e '/# *include <sys\/time\.h>/d' \ + -e '/#include "ath\.h"/ {i \ +#include "g10lib.h" +}' \ + src/ath.c > ttt && + mv ttt src/ath.c && + sed -e 's/^LIBS =/& -ladvapi32 -luser32 -lkernel32/' src/Makefile > ttt && + mv ttt src/Makefile && + sed -e '/^#endif *\/\*_GCRYPT_CONFIG_H_INCLUDED\*\// {i \ +#define snprintf _snprintf \ +#define S_ISREG(x) ((x)&S_IFREG) +}' \ + config.h > ttt && + mv ttt config.h && + make && + make install) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/libgcrypt-$libgcryptver" + if failed_package || test ! -f "$tlibdir/gcrypt.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + ########### # libcurl # ########### @@ -2658,7 +2784,7 @@ cp COPYING "$tlicdir/COPYING.CURL" && mkdir -p "$tincludedir/curl" && cp include/curl/*.h "$tincludedir/curl") >&5 2>&1 && end_package remove_package "$DOWNLOAD_DIR/curl-$curlver" - if failed_package || test ! -f "$tbindir/libcurl.dll"; then + if failed_package || test ! -f "$tlibdir/curl.lib"; then echo "failed" exit -1 else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-09-25 13:04:59
|
Revision: 5312 http://octave.svn.sourceforge.net/octave/?rev=5312&view=rev Author: goffioul Date: 2008-09-25 13:03:18 +0000 (Thu, 25 Sep 2008) Log Message: ----------- Fix gnutls compilation for VS2008 + compile octave against newer cURL Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-09-24 20:11:28 UTC (rev 5311) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-09-25 13:03:18 UTC (rev 5312) @@ -2768,7 +2768,7 @@ fi && create_module_rc gnutls $gnutlsver libgnutls-26.dll "http://www.gnu.org" \ "GnuTLS - TLS/SSL Library" "Copyright (C) 2000-`date +%Y` Free Software Foundation" > lib/gnutls.rc && - ac_cv_c_bigendian=no LIBS="-luser32" \ + ac_cv_c_bigendian=no LIBS="-luser32" W_CPPFLAGS="$W_CPPFLAGS -D_WIN32_WINNT=0x0501" \ configure_package --enable-shared --disable-static --disable-cxx --disable-openssl-compatibility && post_process_libtool && sed -e 's/^libgnutls_la_LDFLAGS =/& -Wl,gnutls.res/' lib/Makefile > ttt && @@ -3219,7 +3219,7 @@ CC=cc-msvc CXX=cc-msvc CFLAGS=-O2 CXXFLAGS=-O2 NM="dumpbin -symbols" \ F77=fc-msvc FFLAGS="-O2" FC=fc-msvc FCFLAGS="-O2" AR=ar-msvc RANLIB=ranlib-msvc \ ./configure --build=i686-pc-msdosmsvc --prefix="$octave_prefix" \ - --with-zlib=zlib --with-curl=libcurl && + --with-zlib=zlib && (cd doc && make conf.texi && sed -e 's,/\([a-z]\)/,\1:/,' conf.texi > ttt && This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-09-29 15:31:25
|
Revision: 5322 http://octave.svn.sourceforge.net/octave/?rev=5322&view=rev Author: goffioul Date: 2008-09-29 15:31:20 +0000 (Mon, 29 Sep 2008) Log Message: ----------- Better libtool support for too long command lines Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-09-29 14:40:59 UTC (rev 5321) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-09-29 15:31:20 UTC (rev 5322) @@ -120,6 +120,50 @@ fi } +function post_process_libtool +{ + if test -z "$1"; then + ltfile=libtool + else + ltfile="$1" + fi + sed -e '/#.*BEGIN LIBTOOL TAG CONFIG: CXX/,/#.*END LIBTOOL TAG CONFIG: CXX/ {/^archive_cmds=.*/,/^postinstall_cmds=.*/ {/^postinstall_cmds=.*/!d;};}' \ + -e 's,/OUT:,-OUT:,g' \ + -e 's/\$EGREP -e "\$export_symbols_regex"/$EGREP -e EXPORTS -e "$export_symbols_regex"/' \ + -e 's/egrep -e "\$export_symbols_regex"/egrep -e EXPORTS -e "$export_symbols_regex"/' \ + -e 's/^export_symbols_cmds="\(.*\) > \\\$export_symbols"/export_symbols_cmds="(echo EXPORTS; \1) > \\$export_symbols"/' \ + -e 's,^\([^=]*\)=.*cygpath.*$,\1="",g' \ + -e 's,-link -dll,-shared,g' \ + -e 's/^wl=.*$/wl="-Wl,"/' \ + -e 's/^deplibs_check_method=.*$/deplibs_check_method="pass_all"/' \ + -e 's,^archive_expsym_cmds=.*$,,' \ + -e 's,^archive_cmds=.*$,\0,p' \ + -e 's,^archive_cmds=\(.*\)$,archive_expsym_cmds=\1,' \ + -e '/^archive_expsym_cmds=/ {s,-shared,-shared ${wl}-def:\\$export_symbols,;}' \ + -e '/^library_names_spec=/ {s, \\$libname\.lib,,;}' \ + -e 's/S_IXUSR/S_IEXEC/g' \ + -e 's/^reload_flag=.*$/reload_flag=""/' \ + -e 's/^reload_cmds=.*$/reload_cmds="lib -OUT:\\$output\\$reload_objs"/' \ + -e 's/^old_archive_from_new_cmds=.*$/old_archive_from_new_cmds=""/' \ + -e 's/^file_list_spec=""/file_list_spec="@"/' \ + -e '/testbindir=.*/ {a\ +case $host in\ + *-*-mingw*)\ + dir=`cd "$dir" && pwd`\ + ;;\ +esac +;}' \ + -e '/cmds=\$old_archive_cmds/ {a \ +elif true; then \ +linkfile="$objdir/link.files" \ +echo "$oldobjs" > $linkfile \ +oldobjs=" @$linkfile" \ +eval cmds=\\"$old_archive_cmds~rm -fr $linkfile\\" +}' \ + -e "s,^postinstall_cmds=.*$,postinstall_cmds='if echo \"\$destdir\" | grep -e \\\\\"/lib/\\\\\\\\?\$\\\\\" >\& /dev/null; then name=\`echo \\\\\$file | sed -e \"s/.*\\\\///\" -e \"s/^lib//\" -e \"s/\\\\.la\$//\"\`; implibname=\`echo \\\\\$dlname | sed -e \"s/\\\\.dll/.lib/\"\`; \$install_prog \$dir/\\\\\$implibname \$destdir/\\\\\$name.lib; test -d \$destdir/../bin || mkdir -p \$destdir/../bin; mv -f \$destdir/\$dlname \$destdir/../bin; fi'," "$ltfile" > ttt && + mv ttt "$ltfile" +} + function unpack_file { filename=$1 @@ -195,6 +239,10 @@ --gui) do_gui=true ;; + --libtool) + post_process_libtool + exit 0 + ;; --prefix=*) INSTALL_DIR=`echo $1 | sed -e 's/--prefix=//'` ;; @@ -351,42 +399,6 @@ EOF } -function post_process_libtool -{ - if test -z "$1"; then - ltfile=libtool - else - ltfile="$1" - fi - sed -e '/#.*BEGIN LIBTOOL TAG CONFIG: CXX/,/#.*END LIBTOOL TAG CONFIG: CXX/ {/^archive_cmds=.*/,/^postinstall_cmds=.*/ {/^postinstall_cmds=.*/!d;};}' \ - -e 's,/OUT:,-OUT:,g' \ - -e 's/\$EGREP -e "\$export_symbols_regex"/$EGREP -e EXPORTS -e "$export_symbols_regex"/' \ - -e 's/egrep -e "\$export_symbols_regex"/egrep -e EXPORTS -e "$export_symbols_regex"/' \ - -e 's/^export_symbols_cmds="\(.*\) > \\\$export_symbols"/export_symbols_cmds="(echo EXPORTS; \1) > \\$export_symbols"/' \ - -e 's,^\([^=]*\)=.*cygpath.*$,\1="",g' \ - -e 's,-link -dll,-shared,g' \ - -e 's/^wl=.*$/wl="-Wl,"/' \ - -e 's/^deplibs_check_method=.*$/deplibs_check_method="pass_all"/' \ - -e 's,^archive_expsym_cmds=.*$,,' \ - -e 's,^archive_cmds=.*$,\0,p' \ - -e 's,^archive_cmds=\(.*\)$,archive_expsym_cmds=\1,' \ - -e '/^archive_expsym_cmds=/ {s,-shared,-shared ${wl}-def:\\$export_symbols,;}' \ - -e '/^library_names_spec=/ {s, \\$libname\.lib,,;}' \ - -e 's/S_IXUSR/S_IEXEC/g' \ - -e 's/^reload_flag=.*$/reload_flag=""/' \ - -e 's/^reload_cmds=.*$/reload_cmds="lib -OUT:\\$output\\$reload_objs"/' \ - -e 's/^old_archive_from_new_cmds=.*$/old_archive_from_new_cmds=""/' \ - -e '/testbindir=.*/ {a\ -case $host in\ - *-*-mingw*)\ - dir=`cd "$dir" && pwd`\ - ;;\ -esac -;}' \ --e "s,^postinstall_cmds=.*$,postinstall_cmds='if echo \"\$destdir\" | grep -e \\\\\"/lib/\\\\\\\\?\$\\\\\" >\& /dev/null; then name=\`echo \\\\\$file | sed -e \"s/.*\\\\///\" -e \"s/^lib//\" -e \"s/\\\\.la\$//\"\`; implibname=\`echo \\\\\$dlname | sed -e \"s/\\\\.dll/.lib/\"\`; \$install_prog \$dir/\\\\\$implibname \$destdir/\\\\\$name.lib; test -d \$destdir/../bin || mkdir -p \$destdir/../bin; mv -f \$destdir/\$dlname \$destdir/../bin; fi'," "$ltfile" > ttt && - mv ttt "$ltfile" -} - ################################################################################### # Check Visual Studio availability This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-09-29 14:41:07
|
Revision: 5321 http://octave.svn.sourceforge.net/octave/?rev=5321&view=rev Author: goffioul Date: 2008-09-29 14:40:59 +0000 (Mon, 29 Sep 2008) Log Message: ----------- Few fixes + prepare 3.0.3 release Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-09-27 23:35:00 UTC (rev 5320) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-09-29 14:40:59 UTC (rev 5321) @@ -590,7 +590,7 @@ todo_check "$tbindir/libpango-1.0-0.dll" pango todo_check "$tlibdir/xml2.lib" libxml2 todo_check "$tlibdir/xslt.lib" libxslt - todo_check "$tlibdir/icu.lib" ICU + todo_check "$tlibdir/icuuc.lib" ICU todo_check "$tlibdir/fontconfig.lib" fontconfig todo_check "$tlibdir/freetype.lib" freetype todo_check "$tlibdir/gd.lib" libgd @@ -616,7 +616,7 @@ fi fi if test ! -z "$of_version"; then - packages="$packages forge" + packages="$packages:forge:" fi todo_check "$tbindir/jogl.jar" JOGL todo_check "$tlibdir/qhull.lib" qhull @@ -645,12 +645,14 @@ todo_check "$tlibdir/avcodec.lib" FFMpeg todo_check "$tlibdir/ftgl.lib" FTGL todo_check "$tlibdir/gtkglext-win32-1.0.lib" gtkglext - todo_check "$tlibdir/gtkglextmm-win32-1.2-0.lib" gtkglextmm + todo_check "$tlibdir/gtkglextmm-win32-1.2.lib" gtkglextmm todo_check "$tlibdir/pthread.lib" pthreads todo_check "$tincludedir/stdint.h" inttypes todo_check "$tincludedir/inttypes.h" inttypes todo_check "$tincludedir/stdbool.h" inttypes - todo_check "$tlibdir/webkit.lib" webkit + if $do_gui; then + todo_check "$tlibdir/webkit.lib" webkit + fi todo_check "$tlibdir/xapian.lib" xapian todo_check "$tlibdir/gpg-error.lib" libgpg-error todo_check "$tlibdir/gcrypt.lib" libgcrypt @@ -3272,7 +3274,7 @@ if test -z "$octave_prefix"; then octave_prefix="$INSTALL_DIR/local/octave-$octave_version" fi - if test -n "`which octave.exe`"; then + if test -n "`which octave.exe 2> /dev/null`"; then echo "WARNING: octave is already in your PATH." echo "WARNING: overridding with $octave_prefix." fi @@ -3507,7 +3509,7 @@ auto=$3 for pack in $pkgs; do echo -n "checking for $pack... " - found=`find "$oforge_prefix" -type d -a -name "$pack-*" -maxdepth 1` + found=`find "$oforge_prefix" -maxdepth 1 -type d -a -name "$pack-*"` if test ! -z "$found"; then echo "installed" else @@ -3525,7 +3527,7 @@ fi TERM=vt100 "$octave_prefix/bin/octave.exe" -q -f -H --eval "page_screen_output(0); pkg install $auto_ -verbose $packpack" fi) - found=`find "$oforge_prefix" -type d -a -name "$pack-*" -maxdepth 1` + found=`find "$oforge_prefix" -maxdepth 1 -type d -a -name "$pack-*"` if test ! -z "$found"; then echo "done" else @@ -3537,11 +3539,12 @@ return 0 } -extra_pkgs="fpl msh ad bim civil-engineering integration java jhandles mapping nan ocs secs1d secs2d symband triangular tsa windows" +extra_pkgs="fpl msh ad bim civil-engineering integration java jhandles mapping nan ocs secs1d secs2d symband tsa windows" # packages to fix: # new packages: -# unsupported packages: engine graceplot multicore pdb tcl-octave xraylib -main_pkgs="signal ann audio bioinfo combinatorics communications control database data-smoothing econometrics time financial fixed ftp miscellaneous ga general gsl ident image informationtheory io irsa linear-algebra missing-functions nnet octcdf odebvp odepkg optim outliers physicalconstants plot sockets specfun special-matrix splines statistics strings struct symbolic video" +# unsupported packages: engine graceplot multicore nlwing2 pdb tcl-octave xraylib +# removed packages: triangular +main_pkgs="miscellaneous optim signal ann audio benchmark bioinfo combinatorics communications control database data-smoothing econometrics time financial fixed ftp ga general gsl ident image informationtheory io irsa linear-algebra missing-functions nnet octcdf odebvp odepkg outliers physicalconstants plot sockets specfun special-matrix splines statistics strings struct symbolic video" # packages to fix: octgpr # new packages: # unsupported packages: optiminterp parallel vrml zenity This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gof...@us...> - 2008-10-13 15:49:00
|
Revision: 5375 http://octave.svn.sourceforge.net/octave/?rev=5375&view=rev Author: goffioul Date: 2008-10-13 15:48:44 +0000 (Mon, 13 Oct 2008) Log Message: ----------- Add pixman compilation + Upgrade glib to 2.18.1 and cairo to 1.8.0 Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh =================================================================== --- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-10-13 08:52:42 UTC (rev 5374) +++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh 2008-10-13 15:48:44 UTC (rev 5375) @@ -38,7 +38,7 @@ verbose=false packages= -available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:pthreads:inttypes:webkit:xapian:libgpg-error:libgcrypt:libtasn1:gnutls:" +available_packages=":f2c:libf2c:fort77:BLAS:LAPACK:ATLAS:FFTW:fftwf:PCRE:GLPK:readline:zlib:SuiteSparse:HDF5:glob:libpng:ARPACK:libjpeg:libiconv:gettext:cairo:glib:pango:freetype:libgd:libgsl:netcdf:sed:makeinfo:units:less:CLN:GiNaC:wxWidgets:gnuplot:FLTK:octave:JOGL:forge:qhull:VC:octplot:ncurses:pkg-config:fc-msvc:libcurl:libxml2:fontconfig:GraphicsMagick:bzip2:ImageMagick:libtiff:libwmf:jasper:GTK:ATK:Glibmm:Cairomm:Gtkmm:libsigc++:libglade:gtksourceview:gdl:VTE:GtkGlArea:PortAudio:playrec:OctaveDE:Gtksourceview1:FTPlib:SQLite3:FFMpeg:FTGL:gtkglext:gtkglextmm:libxslt:ICU:pthreads:inttypes:webkit:xapian:libgpg-error:libgcrypt:libtasn1:gnutls:pixman:" octave_version= of_version= do_nsi=false @@ -59,8 +59,9 @@ glpkver=4.23 gslver=1.10 netcdfver=3.6.2 -cairover=1.4.10 -glibver=2.14.3 +pixmanver=0.12.0 +cairover=1.8.0 +glibver=2.18.1 pangover=1.19.0 ftver=2.3.5 libxml2ver=2.6.30 @@ -160,7 +161,8 @@ oldobjs=" @$linkfile" \ eval cmds=\\"$old_archive_cmds~rm -fr $linkfile\\" }' \ - -e "s,^postinstall_cmds=.*$,postinstall_cmds='if echo \"\$destdir\" | grep -e \\\\\"/lib/\\\\\\\\?\$\\\\\" >\& /dev/null; then name=\`echo \\\\\$file | sed -e \"s/.*\\\\///\" -e \"s/^lib//\" -e \"s/\\\\.la\$//\"\`; implibname=\`echo \\\\\$dlname | sed -e \"s/\\\\.dll/.lib/\"\`; \$install_prog \$dir/\\\\\$implibname \$destdir/\\\\\$name.lib; test -d \$destdir/../bin || mkdir -p \$destdir/../bin; mv -f \$destdir/\$dlname \$destdir/../bin; fi'," "$ltfile" > ttt && + -e "s,^postinstall_cmds=.*$,postinstall_cmds='if echo \"\$destdir\" | grep -e \\\\\"/lib/\\\\\\\\?\$\\\\\" >\& /dev/null; then name=\`echo \\\\\$file | sed -e \"s/.*\\\\///\" -e \"s/^lib//\" -e \"s/\\\\.la\$//\"\`; implibname=\`echo \\\\\$dlname | sed -e \"s/\\\\.dll/.lib/\"\`; \$install_prog \$dir/\\\\\$implibname \$destdir/\\\\\$name.lib; test -d \$destdir/../bin || mkdir -p \$destdir/../bin; mv -f \$destdir/\$dlname \$destdir/../bin; fi'," \ + -e "s,^old_postinstall_cmds=.*,old_postinstall_cmds='chmod 644 \$oldlib~\$RANLIB \$oldlib~mv \$oldlib \`dirname \$oldlib\`/\`basename \$oldlib | sed -e \"s/^lib//\"\`'," "$ltfile" > ttt && mv ttt "$ltfile" } @@ -1752,10 +1754,16 @@ configure_package --enable-shared --disable-static --with-threads=win32 --with-pcre=system && post_process_libtool && echo "#define HAVE_DIRENT_H 1" >> config.h && - sed -e "s/-lws2_32/-luser32 -ladvapi32 -lshell32 -L. -ldirent -lws2_32/" glib/Makefile > ttt && + sed -e "s/-lws2_32/-luser32 -ladvapi32 -lshell32 -L. -ldirent -lws2_32/" \ + -e "s/-DPCRE_STATIC//" \ + glib/Makefile > ttt && mv ttt glib/Makefile && + sed -e "s/strfuncs\$(EXEEXT)//" glib/tests/Makefile > ttt && + mv ttt glib/tests/Makefile && sed -e "s/G_THREAD_LIBS_EXTRA =/G_THREAD_LIBS_EXTRA = -luser32/" gthread/Makefile > ttt && mv ttt gthread/Makefile && + sed -e "s/-lshlwapi/& -lshell32 -ladvapi32/" gio/Makefile > ttt && + mv ttt gio/Makefile && (cd build/win32/dirent && cl -O2 -MD -I. -c *.c && lib -out:dirent.lib *.obj && @@ -1768,7 +1776,8 @@ make && make install && rm -f $tlibdir_quoted/libglib*.la $tlibdir_quoted/libgmodule*.la \ - $tlibdir_quoted/libgthread*.la $tlibdir_quoted/libgobject*.la) >&5 2>&1 && end_package + $tlibdir_quoted/libgthread*.la $tlibdir_quoted/libgobject*.la \ + $tlibdir_quoted/libgio*.la) >&5 2>&1 && end_package remove_package "$DOWNLOAD_DIR/glib-$glibver" if failed_package || test ! -f "$tbindir/libglib-2.0-0.dll"; then echo "failed" @@ -2051,6 +2060,33 @@ fi fi +########## +# pixman # +########## + +if check_package pixman; then + download_file pixman-$pixmanver.tar.gz http://cairographics.org/releases/pixman-$pixmanver.tar.gz + echo -n "decompressing pixman... " + (cd "$DOWNLOAD_DIR" && if ! tar xfz pixman-$pixmanver.tar.gz; then tar xf pixman-$pixmanver.tar.gz; fi) + echo "done" + echo "compiling pixman... " + (cd "$DOWNLOAD_DIR/pixman-$pixmanver" && + ax_cv_c_float_words_bigendian=no configure_package --enable-static --disable-shared && + post_process_libtool && + sed -e "/^SUBDIRS =/ {s/test//;}" Makefile > ttt && + mv ttt Makefile && + make && + make install && + rm -f $tlibdir_quoted/libpixman*.la) >&5 2>&1 && end_package + remove_package "$DOWNLOAD_DIR/pixman-$pixmanver" + if failed_package || test ! -f "$tlibdir/pixman.lib"; then + echo "failed" + exit -1 + else + echo "done" + fi +fi + ######### # cairo # ######### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |