diff -ur saods9/ds9/ds9.C saods9.new/ds9/ds9.C --- saods9/ds9/ds9.C 2009-10-01 18:53:59.000000000 +0200 +++ saods9.new/ds9/ds9.C 2010-03-30 09:57:40.000000000 +0200 @@ -13,8 +13,8 @@ void TclSetStartupScriptFileName(const char*); - int Zvfs_Init(Tcl_Interp*); - int Zvfs_Mount(Tcl_Interp*, char*, char *); +/* int Zvfs_Init(Tcl_Interp*); + int Zvfs_Mount(Tcl_Interp*, char*, char *);*/ int Blt_Init(Tcl_Interp*); int Tktable_Init(Tcl_Interp*); @@ -73,15 +73,15 @@ appname = dupstr(argv[0]); // set default encoding dir - Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4"); +// Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4"); // so that tcl and tk know where to find their libs // we do it here before InitLibraryPath is called - putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4"); - putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4"); +// putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4"); +// putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4"); // invoke startup script - TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl"); + TclSetStartupScriptFileName("/usr/share/ds9/src/ds9.tcl"); } Tcl_Interp *global_interp; @@ -100,13 +100,13 @@ // We have to initialize the virtual filesystem before calling // Tcl_Init(). Otherwise, Tcl_Init() will not be able to find // its startup script files. - if (Zvfs_Init(interp) == TCL_ERROR) +/* if (Zvfs_Init(interp) == TCL_ERROR) return TCL_ERROR; Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, (Tcl_PackageInitProc*)NULL); - +*/ // find current working directory, and set as mount point - { +/* { Tcl_DString pwd; Tcl_DStringInit(&pwd); Tcl_GetCwd(interp, &pwd); @@ -124,7 +124,7 @@ Tcl_DStringValue(&pwd)); #endif Tcl_DStringFree(&pwd); - } + }*/ // Initialize Tcl and Tk if (Tcl_Init(interp)) @@ -133,7 +133,7 @@ // Tk if (Tk_Init(interp)) return TCL_ERROR; - Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit); +// Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit); { Tcl_DString pwd; @@ -143,17 +143,17 @@ } // Blt - if (Blt_Init(interp) == TCL_ERROR) +/* if (Blt_Init(interp) == TCL_ERROR) return TCL_ERROR; Tcl_StaticPackage (interp, "BLT", Blt_Init, (Tcl_PackageInitProc*)NULL); - +*/ // Tktable - if (Tktable_Init(interp) == TCL_ERROR) +/* if (Tktable_Init(interp) == TCL_ERROR) return TCL_ERROR; Tcl_StaticPackage (interp, "Tktable", Tktable_Init, (Tcl_PackageInitProc*)NULL); - +*/ // Checkdns if (Checkdns_Init(interp) == TCL_ERROR) return TCL_ERROR; @@ -173,11 +173,11 @@ (Tcl_PackageInitProc*)NULL); // Tclxpa - if (Tclxpa_Init(interp) == TCL_ERROR) +/* if (Tclxpa_Init(interp) == TCL_ERROR) return TCL_ERROR; Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init, (Tcl_PackageInitProc*)NULL); - +*/ // IIS if (Iis_Init(interp) == TCL_ERROR) return TCL_ERROR; @@ -195,7 +195,7 @@ return TCL_ERROR; // Tkimg - if (Tkimg_Init(interp) == TCL_ERROR) +/* if (Tkimg_Init(interp) == TCL_ERROR) return TCL_ERROR; Tcl_StaticPackage (interp, "img", Tkimg_Init,(Tcl_PackageInitProc*)NULL); @@ -271,7 +271,7 @@ return TCL_ERROR; Tcl_StaticPackage (interp, "window", Tkimgwindow_Init, (Tcl_PackageInitProc*)NULL); - +*/ // Signal_Ext #ifndef _WIN32 if (Signal_ext_Init(interp) == TCL_ERROR) @@ -295,14 +295,14 @@ #endif // Variables - Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY); +/* Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY); Tcl_SetVar(interp, "tcl_libPath", "./zvfsmntpt/tcl8.4", TCL_GLOBAL_ONLY); Tcl_SetVar(interp, "blt_library", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY); Tcl_SetVar(interp, "blt_libPath", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY); Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY); //Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY); - +*/ return TCL_OK; } diff -ur saods9/ds9/Makefile saods9.new/ds9/Makefile --- saods9/ds9/Makefile 2009-09-30 22:35:26.000000000 +0200 +++ saods9.new/ds9/Makefile 2010-03-30 10:00:57.000000000 +0200 @@ -4,11 +4,7 @@ #--------------------------defines ZDIR = zipdir/zvfsmntpt -FFILES = $(ZDIR)/$(TCLVER) \ - $(ZDIR)/$(TKVER) \ - $(ZDIR)/$(BLTVER) \ - $(ZDIR)/$(TCLLIBVER) \ - $(ZDIR)/$(TKCONVER) \ +FFILES = \ $(ZDIR)/$(XMLRPCVER) \ $(ZDIR)/src \ $(ZDIR)/msgs \ @@ -31,38 +27,15 @@ ../lib/libtkhtml.a \ ../lib/libtkmpeg.a \ ../lib/$(TCLXMLVER)/libTclxml3.2.a \ - ../lib/$(TKIMGVER)/libtkimgwindow1.3.a \ - ../lib/$(TKIMGVER)/libtkimgjpeg1.3.a \ - ../lib/$(TKIMGVER)/libjpegtcl1.0.a \ - ../lib/$(TKIMGVER)/libtkimgtiff1.3.a \ - ../lib/$(TKIMGVER)/libtifftcl3.6.1.a \ - ../lib/$(TKIMGVER)/libtkimgpng1.3.a \ - ../lib/$(TKIMGVER)/libpngtcl1.2.6.a \ - ../lib/$(TKIMGVER)/libtkimgppm1.3.a \ - ../lib/$(TKIMGVER)/libtkimggif1.3.a \ - ../lib/$(TKIMGVER)/libtkimgbmp1.3.a \ - ../lib/$(TKIMGVER)/libtkimgxbm1.3.a \ - ../lib/$(TKIMGVER)/libzlibtcl1.2.1.a \ - ../lib/$(TKIMGVER)/libtkimg1.3.a \ - ../lib/$(TKTABLEVER)/libTktable2.9.a \ - ../lib/libfuntools.a \ ../lib/librice.a \ ../lib/libhcomp.a \ ../lib/libplio.a \ ../lib/libast.a \ ../lib/libsaotk.a \ - ../lib/libwcs.a \ ../lib/libsla.a \ - ../lib/libzvfs.a \ - ../lib/libzip.a \ - ../lib/libz.a \ - ../lib/libxpa.a \ ../lib/libiis.a \ ../lib/libcheckdns.a \ - ../lib/libsignal_ext.a \ - ../lib/libBLT24.a \ - ../lib/libtk8.4.a \ - ../lib/libtcl8.4.a + ../lib/libsignal_ext.a endif ifeq ($(OS),windows) @@ -180,13 +153,9 @@ ds9.zip : $(FILES) cd zipdir; zip -r9 ../ds9.zip * else -ds9 : null.zip ds9Base $(FILES) +ds9 : ds9Base $(FILES) $(RM) $@ - cp ds9Base ds9.zip - strip ds9.zip - cat null.zip >> ds9.zip - cd zipdir; zip -rA9 ../ds9.zip * - mv ds9.zip ds9 + cp ds9Base ds9 cp ds9 ../bin/. debug : null.zip ds9Base $(FILES) @@ -357,6 +326,20 @@ rm -f libstdc++.a endif +# for fedora +#--------------------------fedora +ifeq ($(ARCH),fedora) +ds9Base : $(OBJS) $(LIBS) + $(RM) $@ + $(CXX) ${OPTS} \ + -o $@ $(OBJS) $(LIBS) \ + -L$(X11LIB) -lX11 \ + -ldl -lpthread \ + -ltk -ltcl -L${LIBDIR}/blt2.4 -lBLT24 -lxml2 \ + -lfuntools -lwcs -lz +endif + + #--------------------------linux ifneq (,$(findstring linux,$(ARCH)))