Mercurial > hg > xemacs-beta
comparison nt/xemacs.mak @ 488:1e7b510d04f6
[xemacs-hg @ 2001-04-28 21:04:49 by adrian]
[PATCH] nt/*.mak improvements, fix usage of emacs_is_beta from version.sh <3dauawnh.fsf@rapier.ecf.teradyne.com>
author | adrian |
---|---|
date | Sat, 28 Apr 2001 21:04:50 +0000 |
parents | 0784d089fdc9 |
children | 4137b1fb7b90 |
comparison
equal
deleted
inserted
replaced
487:54fa1a5c2d12 | 488:1e7b510d04f6 |
---|---|
67 -DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\" \ | 67 -DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\" \ |
68 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \ | 68 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \ |
69 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ | 69 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ |
70 -DINFODOCK_BUILD_VERSION=$(infodock_build_version) | 70 -DINFODOCK_BUILD_VERSION=$(infodock_build_version) |
71 !else | 71 !else |
72 !if "$(emacs_beta_version)" != "" | 72 !if "$(emacs_is_beta)" != "" |
73 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)-b$(emacs_beta_version) | 73 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)-b$(emacs_beta_version) |
74 !else | 74 !else |
75 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version) | 75 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version).$(emacs_beta_version) |
76 !endif | 76 !endif |
77 PROGRAM_DEFINES= \ | 77 PROGRAM_DEFINES= \ |
78 -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \ | 78 -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \ |
79 -DPATH_PROGNAME=\"xemacs\" \ | 79 -DPATH_PROGNAME=\"xemacs\" \ |
80 -DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\" \ | 80 -DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\" \ |
126 !if !defined(HAVE_XFACE) | 126 !if !defined(HAVE_XFACE) |
127 HAVE_XFACE=0 | 127 HAVE_XFACE=0 |
128 !endif | 128 !endif |
129 !if !defined(HAVE_GIF) | 129 !if !defined(HAVE_GIF) |
130 HAVE_GIF=1 | 130 HAVE_GIF=1 |
131 !endif | |
132 !if !defined(HAVE_GTK) | |
133 HAVE_GTK=0 | |
131 !endif | 134 !endif |
132 !if !defined(HAVE_TOOLBARS) | 135 !if !defined(HAVE_TOOLBARS) |
133 HAVE_TOOLBARS=$(HAVE_XPM) | 136 HAVE_TOOLBARS=$(HAVE_XPM) |
134 !endif | 137 !endif |
135 !if !defined(HAVE_DIALOGS) | 138 !if !defined(HAVE_DIALOGS) |
226 !message Please specify root directory for your X11 installation: X11_DIR=path | 229 !message Please specify root directory for your X11 installation: X11_DIR=path |
227 CONFIG_ERROR=1 | 230 CONFIG_ERROR=1 |
228 !endif | 231 !endif |
229 !if $(HAVE_X_WINDOWS) && defined(X11_DIR) && !exist("$(X11_DIR)\LIB\X11.LIB") | 232 !if $(HAVE_X_WINDOWS) && defined(X11_DIR) && !exist("$(X11_DIR)\LIB\X11.LIB") |
230 !message Specified X11 directory does not contain "$(X11_DIR)\LIB\X11.LIB" | 233 !message Specified X11 directory does not contain "$(X11_DIR)\LIB\X11.LIB" |
234 CONFIG_ERROR=1 | |
235 !endif | |
236 !if $(HAVE_MS_WINDOWS) && $(HAVE_GTK) && !defined(GTK_DIR) | |
237 !message Please specify root directory for your GTK installation: GTK_DIR=path | |
231 CONFIG_ERROR=1 | 238 CONFIG_ERROR=1 |
232 !endif | 239 !endif |
233 !if $(HAVE_MS_WINDOWS) && $(HAVE_XPM) && !defined(XPM_DIR) | 240 !if $(HAVE_MS_WINDOWS) && $(HAVE_XPM) && !defined(XPM_DIR) |
234 !message Please specify root directory for your XPM installation: XPM_DIR=path | 241 !message Please specify root directory for your XPM installation: XPM_DIR=path |
235 CONFIG_ERROR=1 | 242 CONFIG_ERROR=1 |
1055 | 1062 |
1056 $(TEMACS): $(TEMACS_INCLUDES) $(TEMACS_OBJS) $(OUTDIR)\xemacs.res | 1063 $(TEMACS): $(TEMACS_INCLUDES) $(TEMACS_OBJS) $(OUTDIR)\xemacs.res |
1057 !if $(DEBUG_XEMACS) | 1064 !if $(DEBUG_XEMACS) |
1058 @dir /b/s $(OUTDIR)\*.sbr > bscmake.tmp | 1065 @dir /b/s $(OUTDIR)\*.sbr > bscmake.tmp |
1059 bscmake -nologo -o$(TEMACS_BROWSE) @bscmake.tmp | 1066 bscmake -nologo -o$(TEMACS_BROWSE) @bscmake.tmp |
1060 @$(DEL) bscmake.tmp | 1067 $(DEL) bscmake.tmp |
1061 !endif | 1068 !endif |
1062 !if $(USE_PORTABLE_DUMPER) | 1069 !if $(USE_PORTABLE_DUMPER) |
1063 @if exist $(SRC)\dump-id.c del $(SRC)\dump-id.c | 1070 @if exist $(SRC)\dump-id.c del $(SRC)\dump-id.c |
1064 # make a new dump id file. There is probably a better way to do this, but this works | 1071 # make a new dump id file. There is probably a better way to do this, but this works |
1065 @if exist $(OUTDIR)\dump-id.obj del $(OUTDIR)\dump-id.obj | 1072 @if exist $(OUTDIR)\dump-id.obj del $(OUTDIR)\dump-id.obj |
1329 | 1336 |
1330 LOADPATH=$(LISP) | 1337 LOADPATH=$(LISP) |
1331 | 1338 |
1332 # Rebuild docfile target | 1339 # Rebuild docfile target |
1333 docfile :: | 1340 docfile :: |
1334 if exist $(DOC) del $(DOC) | 1341 if exist $(DOC) $(DEL) $(DOC) |
1335 docfile :: $(DOC) | 1342 docfile :: $(DOC) |
1336 | 1343 |
1337 $(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(DOC_SRC10) $(DOC_SRC11) | 1344 $(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(DOC_SRC10) $(DOC_SRC11) |
1338 if exist $(DOC) del $(DOC) | 1345 if exist $(DOC) $(DEL) $(DOC) |
1339 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) | 1346 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) |
1340 set EMACSBOOTSTRAPMODULEPATH=$(MODULES) | 1347 set EMACSBOOTSTRAPMODULEPATH=$(MODULES) |
1341 $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages | 1348 $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages |
1342 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1) | 1349 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1) |
1343 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC2) | 1350 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC2) |
1375 $(TEMACS_LFLAGS) -out:xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj | 1382 $(TEMACS_LFLAGS) -out:xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj |
1376 << | 1383 << |
1377 # Make the resource section read/write since almost all of it is the dump | 1384 # Make the resource section read/write since almost all of it is the dump |
1378 # data which needs to be writable. This avoids having to copy it. | 1385 # data which needs to be writable. This avoids having to copy it. |
1379 editbin -nologo -section:.rsrc,rw xemacs.exe | 1386 editbin -nologo -section:.rsrc,rw xemacs.exe |
1380 del $(TEMACS_DIR)\xemacs.dmp | 1387 $(DEL) $(TEMACS_DIR)\xemacs.dmp |
1381 !endif | 1388 !endif |
1382 cd $(NT) | 1389 cd $(NT) |
1383 @if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@ | 1390 @if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@ |
1384 #------------------------------------------------------------------------------ | 1391 #------------------------------------------------------------------------------ |
1385 | 1392 |
1395 cd $(NT) | 1402 cd $(NT) |
1396 @echo Installing in $(INSTALL_DIR) ... | 1403 @echo Installing in $(INSTALL_DIR) ... |
1397 @echo PlaceHolder > PlaceHolder | 1404 @echo PlaceHolder > PlaceHolder |
1398 @xcopy /q PROBLEMS "$(INSTALL_DIR)\" | 1405 @xcopy /q PROBLEMS "$(INSTALL_DIR)\" |
1399 @xcopy /q PlaceHolder "$(INSTALL_DIR)\lock\" | 1406 @xcopy /q PlaceHolder "$(INSTALL_DIR)\lock\" |
1400 @$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder" | 1407 $(DEL) "$(INSTALL_DIR)\lock\PlaceHolder" |
1401 @xcopy /q $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\" | 1408 @xcopy /q $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\" |
1402 @copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" | 1409 @copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" |
1403 @copy $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" | 1410 @copy $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" |
1404 @copy $(SRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" | 1411 @copy $(SRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" |
1405 @xcopy /e /q $(XEMACS)\etc "$(INSTALL_DIR)\etc\" | 1412 @xcopy /e /q $(XEMACS)\etc "$(INSTALL_DIR)\etc\" |
1406 @xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\" | 1413 @xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\" |
1407 @xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\" | 1414 @xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\" |
1408 @echo Making skeleton package tree in $(PACKAGE_PREFIX) ... | 1415 @echo Making skeleton package tree in $(PACKAGE_PREFIX) ... |
1409 @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\" | 1416 @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\" |
1410 @$(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder" | 1417 $(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder" |
1411 @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\" | 1418 @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\" |
1412 @$(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder" | 1419 $(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder" |
1413 @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\" | 1420 @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\" |
1414 @$(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder" | 1421 $(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder" |
1415 @$(DEL) PlaceHolder | 1422 $(DEL) PlaceHolder |
1416 | 1423 |
1417 mostlyclean: | 1424 mostlyclean: |
1418 $(DEL) $(XEMACS)\Installation | 1425 $(DEL) $(XEMACS)\Installation |
1419 $(DEL) $(OUTDIR)\*.lib $(OUTDIR)\*.obj $(OUTDIR)\*.pdb | 1426 $(DEL) $(OUTDIR)\*.lib $(OUTDIR)\*.obj $(OUTDIR)\*.pdb |
1420 $(DEL) $(OUTDIR)\*.res $(OUTDIR)\*.sbr | 1427 $(DEL) $(OUTDIR)\*.res $(OUTDIR)\*.sbr |
1481 !if $(HAVE_X_WINDOWS) | 1488 !if $(HAVE_X_WINDOWS) |
1482 Compiling in support for X-Windows. | 1489 Compiling in support for X-Windows. |
1483 !endif | 1490 !endif |
1484 !if $(HAVE_MULE) | 1491 !if $(HAVE_MULE) |
1485 Compiling in MULE. | 1492 Compiling in MULE. |
1493 !endif | |
1494 !if $(HAVE_GTK) | |
1495 -------------------------------------------------------------------- | |
1496 WARNING: Compiling WITHOUT GTK support. | |
1497 WARNING: As of xemacs-21.2-b44 | |
1498 WARNING: gtk-xemacs is not supported on MSWindows (mingw or msvc). | |
1499 WARNING: Yes, we know that gtk has been ported to native MSWindows | |
1500 WARNING: but XEmacs is not yet ready to use that port. | |
1501 -------------------------------------------------------------------- | |
1502 !else | |
1503 -------------------------------------------------------------------- | |
1504 WARNING: Compiling without GTK support. | |
1505 WARNING: As of xemacs-21.2-b44 | |
1506 WARNING: gtk-xemacs is not supported on MSWindows (mingw or msvc). | |
1507 WARNING: Yes, we know that gtk has been ported to native MSWindows | |
1508 WARNING: but XEmacs is not yet ready to use that port. | |
1509 -------------------------------------------------------------------- | |
1486 !endif | 1510 !endif |
1487 !if $(HAVE_XPM) | 1511 !if $(HAVE_XPM) |
1488 Compiling in support for XPM images. | 1512 Compiling in support for XPM images. |
1489 !else | 1513 !else |
1490 -------------------------------------------------------------------- | 1514 -------------------------------------------------------------------- |
1579 # scratch, delete it from the command line and then nmake with this | 1603 # scratch, delete it from the command line and then nmake with this |
1580 # target. | 1604 # target. |
1581 update-auto-and-custom: | 1605 update-auto-and-custom: |
1582 # Combine into one invocation to avoid repeated startup penalty. | 1606 # Combine into one invocation to avoid repeated startup penalty. |
1583 $(XEMACS_BATCH) -l autoload -f batch-update-one-directory $(LISP) -f batch-byte-compile-one-file $(LISP)\auto-autoloads.el -l cus-dep -f Custom-make-one-dependency $(LISP) -f batch-byte-compile-one-file $(LISP)\custom-load.el | 1607 $(XEMACS_BATCH) -l autoload -f batch-update-one-directory $(LISP) -f batch-byte-compile-one-file $(LISP)\auto-autoloads.el -l cus-dep -f Custom-make-one-dependency $(LISP) -f batch-byte-compile-one-file $(LISP)\custom-load.el |
1584 @$(DEL) $(LISP)\auto-autoloads.el~ | 1608 $(DEL) $(LISP)\auto-autoloads.el~ |
1585 @$(DEL) $(LISP)\custom-load.el~ | 1609 $(DEL) $(LISP)\custom-load.el~ |
1586 | 1610 |
1587 # DO NOT DELETE THIS LINE -- make depend depends on it. | 1611 # DO NOT DELETE THIS LINE -- make depend depends on it. |
1588 | 1612 |