Tk Library Source Code

Artifact [601924ba1f]
Login

Artifact 601924ba1fb4351457ecd3cfd903b108b04fcd55:

Attachment "control.diff.3" to ticket [475846ffff] added by andreas_kupries 2001-11-06 08:52:40.
? tcllib1.1.tar.gz
? tcllib1.1.zip
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tcllib/tcllib/ChangeLog,v
retrieving revision 1.69
diff -u -r1.69 ChangeLog
--- ChangeLog	2001/11/04 04:49:51	1.69
+++ ChangeLog	2001/11/06 01:46:03
@@ -1,3 +1,12 @@
+2001-11-04  Andreas Kupries  <[email protected]>
+
+	* mkInstallScripts.tcl: Added code to install tclIndex files.
+
+	* Makefile.in (install-libraries, dist): Added commands to copy
+	  'tclIndex' files into installation and distribution. This fixes
+	  the remainder of #475846.
+	  (dist): Fixed error in generation of tar/zip files too.
+
 2001-11-01  Andreas Kupries  <[email protected]>
 
 	* mime: Fixed bugs #477088, #472009.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/tcllib/tcllib/Makefile.in,v
retrieving revision 1.49
diff -u -r1.49 Makefile.in
--- Makefile.in	2001/08/24 17:01:00	1.49
+++ Makefile.in	2001/11/06 01:46:03
@@ -215,6 +215,9 @@
 		for j in $(srcdir)/modules/$$i/*.tcl ; do \
 		    $(INSTALL_DATA) $$j $(pkglibdir)/$$i ; \
 		done; \
+		if test -f $(srcdir)/modules/$$i/tclIndex ; then \
+		    $(INSTALL_DATA) $(srcdir)/modules/$$i/tclIndex $(pkglibdir)/$$i ; \
+		fi \
 	    fi; \
 	done;
 	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/mkIndex.tcl` `$(CYGPATH) $(pkglibdir)` tcllib $(VERSION) $(MODULES) smtp
@@ -258,16 +261,16 @@
 	    cp $(srcdir)/modules/$$j/*.html $(srcdir)/tcllib$(VERSION)/$$j ; \
 	    cp $(srcdir)/modules/$$j/*.tcl $(srcdir)/tcllib$(VERSION)/$$j ; \
 	    cp $(srcdir)/modules/$$j/*.test $(srcdir)/tcllib$(VERSION)/$$j ; \
+	    cp $(srcdir)/modules/$$j/tclIndex $(srcdir)/tcllib$(VERSION)/$$j ; \
 	done
 	$(TCLSH_PROG) $(srcdir)/mkIndex.tcl $(srcdir)/tcllib$(VERSION) tcllib $(VERSION) $(MODULES)
 	$(TCLSH_PROG) $(srcdir)/mkInstallScripts.tcl $(srcdir)/tcllib$(VERSION) tcllib $(VERSION) $(MODULES)
 	for j in license.terms README ; do \
 	    cp $(srcdir)/$$j $(srcdir)/tcllib$(VERSION)/$$j ; \
 	done
-	cd $(srcdir)
-	tar cf tcllib$(VERSION).tar tcllib$(VERSION)
-	gzip tcllib$(VERSION).tar
-	zip -r tcllib$(VERSION).zip tcllib$(VERSION)
+	cd $(srcdir) ; tar cf tcllib$(VERSION).tar tcllib$(VERSION)
+	cd $(srcdir) ; gzip tcllib$(VERSION).tar
+	cd $(srcdir) ; zip -r tcllib$(VERSION).zip tcllib$(VERSION)
 	rm -rf $(srcdir)/tcllib$(VERSION)
 
 # Check tcllib and report all modules without documentation and/or testsuite.
Index: mkInstallScripts.tcl
===================================================================
RCS file: /cvsroot/tcllib/tcllib/mkInstallScripts.tcl,v
retrieving revision 1.5
diff -u -r1.5 mkInstallScripts.tcl
--- mkInstallScripts.tcl	2000/04/29 04:40:20	1.5
+++ mkInstallScripts.tcl	2001/11/06 01:46:03
@@ -43,8 +43,9 @@
 puts $f "    if \[ ! -d \$TCLINSTALL/lib/$package$version/\$j \] ; then \\"
 puts $f "        mkdir \$TCLINSTALL/lib/$package$version/\$j ; \\"
 puts $f "    fi; \\"
-puts $f "    cp -f \$j/*.tcl \$TCLINSTALL/lib/$package$version/\$j ; \\"
-puts $f "    cp -f \$j/*.n   \$TCLINSTALL/man/mann ; \\"
+puts $f "    cp -f \$j/*.tcl    \$TCLINSTALL/lib/$package$version/\$j ; \\"
+puts $f "    cp -f \$j/tclIndex \$TCLINSTALL/lib/$package$version/\$j ; \\"
+puts $f "    cp -f \$j/*.n      \$TCLINSTALL/man/mann ; \\"
 puts $f "done"
 close $f
 file attributes $installFile -permissions 0755