summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2002-10-09 13:02:08 (GMT)
committerdas <das>2002-10-09 13:02:08 (GMT)
commit58b1fc063d0c3ba5d8e21f41ed0d6c9dea0affd8 (patch)
treeecb30ad1a8b0524a40f15afaca757250ca4cabea
parent4278227fc8a6be392dcdaeeb74167fd1197e50ed (diff)
downloadtk-58b1fc063d0c3ba5d8e21f41ed0d6c9dea0affd8.zip
tk-58b1fc063d0c3ba5d8e21f41ed0d6c9dea0affd8.tar.gz
tk-58b1fc063d0c3ba5d8e21f41ed0d6c9dea0affd8.tar.bz2
* macosx/Makefile: don't remove tclsh after building embedded.
* macosx/Wish.pbproj/project.pbxproj: bumped version to 8.4.1; added missing library/mkpsenc.tcl to framework.
-rw-r--r--ChangeLog7
-rw-r--r--macosx/Makefile4
-rw-r--r--macosx/Wish.pbproj/project.pbxproj31
3 files changed, 35 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0040bcb..03776e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2002-10-09 Daniel Steffen <das@users.sourceforge.net>
+ * macosx/Makefile: don't remove tclsh after building embedded.
+
+ * macosx/Wish.pbproj/project.pbxproj: bumped version to 8.4.1;
+ added missing library/mkpsenc.tcl to framework.
+
+2002-10-09 Daniel Steffen <das@users.sourceforge.net>
+
* generic/tkInt.decls(tkIntXlib): added XQueryTree declaration for
mac & aqua, since it's now called from ParentXId via Tk_HandleEvent.
* generic/tkIntXlibDecls.h:
diff --git a/macosx/Makefile b/macosx/Makefile
index 64e1ca6..aecdc8d 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -3,7 +3,7 @@
# Simple makefile for building on Mac OS X with the
# Project Builder command line tool 'pbxbuild'
#
-# RCS: @(#) $Id: Makefile,v 1.4 2002/09/26 17:07:33 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.5 2002/10/09 13:02:08 das Exp $
#
################################################################################
@@ -79,7 +79,7 @@ forceRelink:
forceRelinkTcl:
@-cd ${BUILD_DIR}; \
- rm -rf Tcl.framework tclsh8.4 \
+ rm -rf Tcl.framework \
Development.build/Tcl.build/Tcl Deployment.build/Tcl.build/Tcl
cleanup-embedded:
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index ace6258..dfe39a7 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -1380,7 +1380,7 @@
SECTORDER_FLAGS = "";
TK_MAJOR_VERSION = 8;
TK_MINOR_VERSION = 4;
- TK_PATCH_LEVEL = .0;
+ TK_PATCH_LEVEL = .1;
TK_VERSION = 8.4;
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@@ -1416,11 +1416,11 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>8.4.0</string>
+ <string>8.4.1</string>
<key>CFBundleSignature</key>
<string>WiSH</string>
<key>CFBundleVersion</key>
- <string>8.4.0</string>
+ <string>8.4.1</string>
</dict>
</plist>
";
@@ -1487,6 +1487,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
F53755E1016C38D301DC9062 = {
buildActionMask = 2147483647;
files = (
+ F5C2EA34034D71B2016F146B,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -2791,11 +2792,11 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>8.4.0</string>
+ <string>8.4.1</string>
<key>CFBundleSignature</key>
<string>WiSH</string>
<key>CFBundleVersion</key>
- <string>8.4.0</string>
+ <string>8.4.1</string>
</dict>
</plist>
";
@@ -3118,6 +3119,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
F5B1FC13016FFE3501DC9062,
F5B1FC14016FFE3501DC9062,
F5B1FC15016FFE3501DC9062,
+ F5C2EA35034D7212016F146B,
F5B1FC16016FFE3501DC9062,
F5B1FC17016FFE3501DC9062,
F5B1FC18016FFE3501DC9062,
@@ -3369,6 +3371,24 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
shellPath = /bin/sh;
shellScript = "# synthesize tkConfig.sh via buildTkConfig.tcl script\nexport DYLD_FRAMEWORK_PATH=${SYMROOT}\n\"${SYMROOT}/tclsh${FRAMEWORK_VERSION}\" \"${SRCROOT}/buildTkConfig.tcl\" \"${TARGET_BUILD_DIR}/Tcl.${WRAPPER_EXTENSION}/Resources/tclConfig.sh\" \"${SRCROOT}/../unix/tkConfig.sh.in\" \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Resources/tkConfig.sh\"";
};
+ F5C2EA33034D71B2016F146B = {
+ isa = PBXFileReference;
+ name = mkpsenc.tcl;
+ path = ../library/mkpsenc.tcl;
+ refType = 2;
+ };
+ F5C2EA34034D71B2016F146B = {
+ fileRef = F5C2EA33034D71B2016F146B;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5C2EA35034D7212016F146B = {
+ fileRef = F5C2EA33034D71B2016F146B;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5C88659017D625C01DC9062 = {
children = (
F5C8865A017D625C01DC9062,
@@ -3405,6 +3425,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
F5DF0932016CD3F901DC9062,
F5DF0933016CD3F901DC9062,
F5DF0934016CD3F901DC9062,
+ F5C2EA33034D71B2016F146B,
F5DF0935016CD3F901DC9062,
F5DF0936016CD3F901DC9062,
F5DF0937016CD3F901DC9062,