projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 25f687b8 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.122 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.122 | |
| 11 | Problem: Mac: building Vim.app fails. Using wrong architecture. | |
| 12 | Solution: Use line continuation for the gui_bundle dependency. Detect the | |
| 13 | system architecture with "uname -a". | |
| 14 | Files: src/main.aap | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.121/src/main.aap Thu May 10 18:48:19 2007 | |
| 18 | --- src/main.aap Tue Sep 25 21:26:03 2007 | |
| 19 | *************** | |
| 20 | *** 56,64 **** | |
| 21 | config {virtual} auto/config.h auto/config.aap : | |
| 22 | auto/configure.aap configure.aap | |
| 23 | config.arg config.h.in config.aap.in | |
| 24 | :sys CONFIG_STATUS=auto/config.status | |
| 25 | ./configure.aap `file2string("config.arg")` | |
| 26 | ! --with-mac-arch=ppc | |
| 27 | --cache-file=auto/config.cache | |
| 28 | ||
| 29 | # Configure arguments: create an empty "config.arg" file when its missing | |
| 30 | --- 56,71 ---- | |
| 31 | config {virtual} auto/config.h auto/config.aap : | |
| 32 | auto/configure.aap configure.aap | |
| 33 | config.arg config.h.in config.aap.in | |
| 34 | + # Use "uname -a" to detect the architecture of the system. | |
| 35 | + @ok, uname = redir_system('uname -a', 0) | |
| 36 | + @if string.find(uname, "i386") >= 0: | |
| 37 | + @ arch = "i386" | |
| 38 | + @else: | |
| 39 | + @ arch = "ppc" | |
| 40 | + :print Building for $arch system | |
| 41 | :sys CONFIG_STATUS=auto/config.status | |
| 42 | ./configure.aap `file2string("config.arg")` | |
| 43 | ! --with-mac-arch=$arch | |
| 44 | --cache-file=auto/config.cache | |
| 45 | ||
| 46 | # Configure arguments: create an empty "config.arg" file when its missing | |
| 47 | *************** | |
| 48 | *** 1167,1173 **** | |
| 49 | :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime | |
| 50 | # TODO: Create the vimtutor application. | |
| 51 | ||
| 52 | ! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info | |
| 53 | bundle-resource bundle-language | |
| 54 | ||
| 55 | bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET) | |
| 56 | --- 1174,1180 ---- | |
| 57 | :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime | |
| 58 | # TODO: Create the vimtutor application. | |
| 59 | ||
| 60 | ! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info \ | |
| 61 | bundle-resource bundle-language | |
| 62 | ||
| 63 | bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET) | |
| 64 | *************** | |
| 65 | *** 1187,1193 **** | |
| 66 | :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist | |
| 67 | ||
| 68 | bundle-resource {virtual}: bundle-dir bundle-rsrc | |
| 69 | ! :copy {force} $(RSRC_DIR)/*.icns $(RESDIR) | |
| 70 | ||
| 71 | ### Classic resources | |
| 72 | # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9) | |
| 73 | --- 1194,1200 ---- | |
| 74 | :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist | |
| 75 | ||
| 76 | bundle-resource {virtual}: bundle-dir bundle-rsrc | |
| 77 | ! :copy {force} $(RSRC_DIR)/*.icns $(RESDIR) | |
| 78 | ||
| 79 | ### Classic resources | |
| 80 | # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9) | |
| 81 | *** ../vim-7.1.121/src/version.c Tue Sep 25 20:39:14 2007 | |
| 82 | --- src/version.c Tue Sep 25 22:12:16 2007 | |
| 83 | *************** | |
| 84 | *** 668,669 **** | |
| 85 | --- 668,671 ---- | |
| 86 | { /* Add new patch number below this line */ | |
| 87 | + /**/ | |
| 88 | + 122, | |
| 89 | /**/ | |
| 90 | ||
| 91 | -- | |
| 92 | Men may not be seen publicly in any kind of strapless gown. | |
| 93 | [real standing law in Florida, United States of America] | |
| 94 | ||
| 95 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 96 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 97 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 98 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |