Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove qvm-ng #300

Merged
merged 1 commit into from
Oct 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
Copyright 2016-2019 Rigetti Computing


All source code, except that which is contained in the `app` and
`app-ng` directories and subdirectories thereof, is licensed under
the Apache License version 2.0, contained in the remainder of this
file.
All source code, except that which is contained in the `app`
directories and subdirectories thereof, is licensed under the Apache
License version 2.0, contained in the remainder of this file.

Source code contained in the `app` and `app-ng` directories and
subdirectories thereof is licensed under the GNU Affero General
Public License version 3.0. See (`app/LICENSE.txt`)[app/LICENSE.txt]
and (`app-ng/LICENSE.txt`)[app-ng/LICENSE.txt], respectively.
Source code contained in the `app` directories and subdirectories
thereof is licensed under the GNU Affero General Public License
version 3.0. See (`app/LICENSE.txt`)[app/LICENSE.txt].

N.B. All of the ASDF systems are documented with their license:

Expand All @@ -24,8 +22,6 @@ N.B. All of the ASDF systems are documented with their license:
QVM-TESTS is licensed under Apache License 2.0 (See LICENSE.txt)
QVM-APP is licensed under GNU Affero General Public License v3.0 (See app/LICENSE.txt)
QVM-APP-TESTS is licensed under GNU Affero General Public License v3.0 (See app/LICENSE.txt)
QVM-APP-NG is licensed under GNU Affero General Public License v3.0 (See app-ng/LICENSE.txt)
QVM-APP-NG-TESTS is licensed under GNU Affero General Public License v3.0 (See app-ng/LICENSE.txt)


* * * * *
Expand Down
36 changes: 2 additions & 34 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ system-index.txt: $(QUICKLISP_SETUP)
$(FOREST_SDK_FEATURE) \
--eval '(ql:quickload "cffi-grovel")' \
--eval '(ql:quickload "qvm-app")' \
--eval '(ql:quickload "qvm-app-ng")' \
--eval '(ql:write-asdf-manifest-file "system-index.txt")'

###############################################################################
Expand Down Expand Up @@ -85,13 +84,6 @@ qvm: system-index.txt
--load build-app.lisp \
$(FOREST_SDK_OPTION)

qvm-ng: system-index.txt
$(SBCL) $(FOREST_SDK_FEATURE) \
--eval "(setf sb-ext:\*on-package-variance\* '(:warn (:swank :swank-backend :swank-repl) :error t))" \
$(QVM_FEATURE_FLAGS) \
--load build-app-ng.lisp \
$(FOREST_SDK_OPTION)

qvm-sdk-base: FOREST_SDK_FEATURE=--eval '(pushnew :forest-sdk *features*)' \
--eval '(push :drakma-no-ssl *features*)'
qvm-sdk-base: QVM_WORKSPACE=10240
Expand Down Expand Up @@ -124,15 +116,13 @@ docker-sdk-barebones: docker
###############################################################################

.PHONY: install
install: qvm qvm-ng
install: qvm
install -d $(DESTDIR)$(PREFIX)/bin/
install qvm $(DESTDIR)$(PREFIX)/bin/
install qvm-ng $(DESTDIR)$(PREFIX)/bin/

.PHONY: uninstall
uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/qvm
rm -f $(DESTDIR)$(PREFIX)/bin/qvm-ng

###############################################################################
# TEST
Expand Down Expand Up @@ -160,28 +150,6 @@ test-app:
--eval '(ql:quickload :qvm-app-tests)' \
--eval '(asdf:test-system :qvm-app)'

test-app-ng: QVM_FEATURES=qvm-intrinsics
test-app-ng:
$(QUICKLISP) \
--eval '(ql:quickload :qvm-app-ng-tests)' \
--eval '(asdf:test-system :qvm-app-ng)'

# Re-run the full QVM-APP-NG-TESTS suite using the generic bordeaux-threads implementation of the
# SAFETY-HASH package. Run the test-app-ng target via a recursive make invocation here, rather than
# specifying it as a prerequisite; otherwise, in a command line invocation like
#
# make test-app-ng test-app-ng-with-generic-safety-hash
#
# Make will consider the test-app-ng goal to be up-to-date when test-app-ng-with-generic-safety-hash
# runs. Run clean-qvm-cache before and after to ensure that this and subsequent builds aren't
# polluted with stale FASLs. Since nuking the cache in this way is obnoxious, don't run these tests
# as a prerequisite of the default "make test" target.
test-app-ng-with-generic-safety-hash: QVM_FEATURES=qvm-intrinsics qvm-app-ng-generic-safety-hash
test-app-ng-with-generic-safety-hash:
$(MAKE) clean-qvm-cache
$(MAKE) QVM_FEATURES="$(QVM_FEATURES)" test-app-ng
$(MAKE) clean-qvm-cache

test-ccl:
ccl --batch --eval '(ql:quickload :qvm)' --eval '(quit)'

Expand All @@ -195,7 +163,7 @@ coverage:

# Clean the executables
clean:
rm -f qvm qvm-ng build-output.log system-index.txt
rm -f qvm build-output.log system-index.txt

# Clean the Lisp cache, reindex local projects.
clean-cache:
Expand Down
17 changes: 0 additions & 17 deletions app-ng/CrustyOldDockerfile

This file was deleted.

23 changes: 0 additions & 23 deletions app-ng/Dockerfile

This file was deleted.

Loading