Skip to content

Commit 5efa1b8

Browse files
Khaleodemoura
authored andcommitted
1 parent bcad530 commit 5efa1b8

37 files changed

+3
-3806
lines changed

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ About
1818
- [Homepage](http://leanprover.github.io)
1919
- [Theorem Proving in Lean](https://leanprover.github.io/theorem_proving_in_lean/index.html)
2020
- [Core library](library/library.md)
21-
- [Emacs Mode](src/emacs/README.md)
2221
- [Change Log](doc/changes.md)
2322
- For HoTT mode, please use [Lean2](https://github.com/leanprover/lean2).
2423

bin/.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
lean
22
lean.exe
3-
leanemacs
4-
leanemacs.bat

bin/leanemacs.bat.in

-4
This file was deleted.

bin/leanemacs.in

-8
This file was deleted.

bin/leanemacs_build

-8
This file was deleted.

bin/leanemacs_build.bat

-4
This file was deleted.

bin/test_leanemacs

-9
This file was deleted.

doc/bin/README.md

+1-12
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,10 @@ The binary distribution package contains:
55

66
- Lean executable (located in the sub-directory bin)
77
- Standard library (located in the sub-directory lib/lean/library)
8-
- Emacs modes (located in the sub-directory share/emacs/site-list/lean)
98

109
Assuming you are in the same directory this file is located,
1110
the following command executes a simple set of examples
1211

1312
% bin/lean examples/ex.lean
1413

15-
The Emacs mode is the ideal way to use Lean. It requires at
16-
least Emacs version 24.3
17-
18-
Documentation
19-
-------------
20-
21-
The tutorial "Theorem Proving in Lean" describes Lean main features,
22-
and provides many examples. The tutorial is available in two different forms:
23-
24-
- Interactive HTML: http://leanprover.github.io/tutorial/index.html
25-
- PDF: http://leanprover.github.io/tutorial/tutorial.pdf
14+
For more information on Lean and supported editors, please see https://leanprover.github.io/documentation/.

doc/changes.md

+2
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ For more details, see discussion [here](https://github.com/leanprover/lean/pull/
150150

151151
* User attributes can no longer be set with `set_basic_attribute`. You need to use `user_attribute.set` now.
152152

153+
* The Emacs mode has been moved into its own repository and MELPA packages: https://github.com/leanprover/lean-mode
154+
153155
*API name changes*
154156

155157
* `list.dropn` => `list.drop`

src/CMakeLists.txt

-23
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ option(CUSTOM_ALLOCATORS "CUSTOM_ALLOCATORS" ON)
5050
option(SAVE_SNAPSHOT "SAVE_SNAPSHOT" ON)
5151
option(SAVE_INFO "SAVE_INFO" ON)
5252

53-
# emacs site-lisp dir
54-
set(EMACS_LISP_DIR "share/emacs/site-lisp/lean" CACHE STRING "emacs site-lisp dir")
5553
# library dir
5654
set(LIBRARY_DIR "lib/lean" CACHE STRING "library dir")
5755
set(LEAN_EXT_INCLUDE_DIR "include/lean_ext" CACHE STRING "include dir for building Lean extensions")
@@ -102,8 +100,6 @@ if (NOT("${SAVE_INFO}" MATCHES "ON"))
102100
set(LEAN_EXTRA_CXX_FLAGS "${LEAN_EXTRA_CXX_FLAGS} -D LEAN_NO_INFO")
103101
endif()
104102

105-
message(STATUS "Lean emacs-mode will be installed at "
106-
"${CMAKE_INSTALL_PREFIX}/${EMACS_LISP_DIR}")
107103
message(STATUS "Lean library will be installed at "
108104
"${CMAKE_INSTALL_PREFIX}/${LIBRARY_DIR}")
109105

@@ -192,7 +188,6 @@ set(CMAKE_CXX_FLAGS_GPROF "-O2 -g -pg")
192188
set(CPACK_DMG_BACKGROUND_IMAGE "${LEAN_SOURCE_DIR}/../images/lean.png")
193189
set(CPACK_DMG_VOLUME_NAME "Lean-${LEAN_VERSION_STRING}")
194190
set(CPACK_BUNDLE_NAME "Lean-${LEAN_VERSION_STRING}")
195-
set(CPACK_BUNDLE_STARTUP_COMMAND "bin/leanemacs")
196191
set(CPACK_PACKAGE_ICON "${LEAN_SOURCE_DIR}/../images/lean.png")
197192
##################
198193

@@ -352,10 +347,6 @@ configure_file("${LEAN_SOURCE_DIR}/githash.h.in" "${LEAN_BINARY_DIR}/githash.h")
352347
# Version
353348
configure_file("${LEAN_SOURCE_DIR}/version.h.in" "${LEAN_BINARY_DIR}/version.h")
354349

355-
# leanemacs file
356-
configure_file("${LEAN_SOURCE_DIR}/../bin/leanemacs.in" "${LEAN_SOURCE_DIR}/../bin/leanemacs")
357-
configure_file("${LEAN_SOURCE_DIR}/../bin/leanemacs.bat.in" "${LEAN_SOURCE_DIR}/../bin/leanemacs.bat")
358-
359350
include_directories("${LEAN_BINARY_DIR}")
360351
add_subdirectory(util)
361352
set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:util>)
@@ -419,7 +410,6 @@ if (NOT("${CROSS_COMPILE}" MATCHES "ON"))
419410
endif()
420411

421412
add_subdirectory(shell)
422-
add_subdirectory(emacs)
423413

424414
function(add_exec_test name tgt)
425415
if(${EMSCRIPTEN})
@@ -494,16 +484,6 @@ install(FILES "${CMAKE_SOURCE_DIR}/../bin/leanpkg"
494484
DESTINATION bin
495485
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
496486

497-
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
498-
install(FILES "${CMAKE_SOURCE_DIR}/../bin/leanemacs.bat" "${CMAKE_SOURCE_DIR}/../bin/leanemacs.bat"
499-
DESTINATION bin
500-
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
501-
else()
502-
install(FILES "${CMAKE_SOURCE_DIR}/../bin/leanemacs" "${CMAKE_SOURCE_DIR}/../bin/leanemacs"
503-
DESTINATION bin
504-
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
505-
endif()
506-
507487
install(DIRECTORY "${CMAKE_SOURCE_DIR}/../library" DESTINATION "${LIBRARY_DIR}"
508488
FILES_MATCHING
509489
PATTERN "*.lean"
@@ -522,9 +502,6 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/" DESTINATION "${LEAN_EXT_INCLUDE_DIR}"
522502
FILES_MATCHING
523503
PATTERN "*.h")
524504

525-
install(FILES "${CMAKE_SOURCE_DIR}/../src/emacs/lean.pgm"
526-
DESTINATION "${EMACS_LISP_DIR}")
527-
528505
if("${INCLUDE_MSYS2_DLLS}" MATCHES "ON")
529506
# TODO(Leo): do not use hardlinks to required DLLs.
530507
# For example, we can try to use ldd to retrieve the list of required DLLs.

src/emacs/.gitignore

-2
This file was deleted.

src/emacs/CMakeLists.txt

-2
This file was deleted.

src/emacs/Cask

-14
This file was deleted.

src/emacs/Makefile

-17
This file was deleted.

src/emacs/README.md

-165
This file was deleted.

0 commit comments

Comments
 (0)