From d88d4f93b3390989bd47a43f3941ca7d576750f6 Mon Sep 17 00:00:00 2001 From: Jens Geyer Date: Sat, 5 Mar 2022 18:15:38 +0100 Subject: THRIFT-5501 Remove Common Lisp support Client: cl Patch: Jens Geyer --- tutorial/Makefile.am | 4 -- tutorial/cl/Makefile.am | 67 -------------------------------- tutorial/cl/load-locally.lisp | 22 ----------- tutorial/cl/make-tutorial-client.lisp | 51 ------------------------ tutorial/cl/make-tutorial-server.lisp | 29 -------------- tutorial/cl/shared-implementation.lisp | 25 ------------ tutorial/cl/thrift-tutorial.asd | 17 -------- tutorial/cl/tutorial-implementation.lisp | 41 ------------------- 8 files changed, 256 deletions(-) delete mode 100755 tutorial/cl/Makefile.am delete mode 100644 tutorial/cl/load-locally.lisp delete mode 100644 tutorial/cl/make-tutorial-client.lisp delete mode 100644 tutorial/cl/make-tutorial-server.lisp delete mode 100644 tutorial/cl/shared-implementation.lisp delete mode 100644 tutorial/cl/thrift-tutorial.asd delete mode 100644 tutorial/cl/tutorial-implementation.lisp (limited to 'tutorial') diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am index ba445e0db..77e8593ea 100755 --- a/tutorial/Makefile.am +++ b/tutorial/Makefile.am @@ -74,10 +74,6 @@ if WITH_RS SUBDIRS += rs endif -if WITH_CL -SUBDIRS += cl -endif - if WITH_PERL SUBDIRS += perl endif diff --git a/tutorial/cl/Makefile.am b/tutorial/cl/Makefile.am deleted file mode 100755 index 77e995c2e..000000000 --- a/tutorial/cl/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -setup-local-lisp-env: ../../lib/cl/ensure-externals.sh - bash ../../lib/cl/ensure-externals.sh - -gen-cl: $(top_srcdir)/tutorial/tutorial.thrift - $(THRIFT) --gen cl -r $< - -ALL_FILE_PREREQS = \ - load-locally.lisp \ - make-tutorial-server.lisp \ - make-tutorial-client.lisp \ - shared-implementation.lisp \ - thrift-tutorial.asd \ - tutorial-implementation.lisp - -# NOTE: the server and client cannot be built in parallel -# because on loading the make-tutorial-* scripts SBCL will -# attempt to compile their dependencies. Unfortunately, -# because their dependencies are shared, parallel jobs can -# end up overwriting or corrupting the compiled files -all-local: gen-cl setup-local-lisp-env $(ALL_FILE_PREREQS) - @echo 'cl broken, commented out due to deprecation' - ## $(SBCL) --script make-tutorial-server.lisp - ## $(SBCL) --script make-tutorial-client.lisp - -tutorialserver: all - ./TutorialServer - -tutorialclient: all - ./TutorialClient - -clean-local: - -$(RM) -r gen-* - -$(RM) -r externals - -$(RM) -r quicklisp - -$(RM) -r lib - -$(RM) quicklisp.lisp - -$(RM) backport-update.zip - -$(RM) shared-implementation.fasl - -$(RM) tutorial-implementation.fasl - -$(RM) TutorialServer - -$(RM) TutorialClient - -EXTRA_DIST = \ - tutorial-implementation.lisp \ - shared-implementation.lisp \ - thrift-tutorial.asd \ - make-tutorial-server.lisp \ - make-tutorial-client.lisp \ - load-locally.lisp diff --git a/tutorial/cl/load-locally.lisp b/tutorial/cl/load-locally.lisp deleted file mode 100644 index b52a0a269..000000000 --- a/tutorial/cl/load-locally.lisp +++ /dev/null @@ -1,22 +0,0 @@ -(in-package #:cl-user) - -;;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;;; you may not use this file except in compliance with the License. -;;;; You may obtain a copy of the License at -;;;; -;;;; http://www.apache.org/licenses/LICENSE-2.0 -;;;; -;;;; Unless required by applicable law or agreed to in writing, software -;;;; distributed under the License is distributed on an "AS IS" BASIS, -;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;;; See the License for the specific language governing permissions and -;;;; limitations under the License. - -;;;; Just a script for loading the library itself, using bundled dependencies. -;;;; This is an identical copy of the file in lib/cl. - -(require "asdf") - -(load (merge-pathnames "externals/bundle.lisp" *load-truename*)) -(asdf:load-asd (merge-pathnames "lib/de.setf.thrift-backport-update/thrift.asd" *load-truename*)) -(asdf:load-system :thrift) diff --git a/tutorial/cl/make-tutorial-client.lisp b/tutorial/cl/make-tutorial-client.lisp deleted file mode 100644 index 3a6d86134..000000000 --- a/tutorial/cl/make-tutorial-client.lisp +++ /dev/null @@ -1,51 +0,0 @@ -(in-package #:cl-user) - -;;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;;; you may not use this file except in compliance with the License. -;;;; You may obtain a copy of the License at -;;;; -;;;; http://www.apache.org/licenses/LICENSE-2.0 -;;;; -;;;; Unless required by applicable law or agreed to in writing, software -;;;; distributed under the License is distributed on an "AS IS" BASIS, -;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;;; See the License for the specific language governing permissions and -;;;; limitations under the License. - -(require "asdf") -(load (merge-pathnames "load-locally.lisp" *load-truename*)) -(asdf:load-system :net.didierverna.clon) -(asdf:load-asd (merge-pathnames "gen-cl/shared/thrift-gen-shared.asd" *load-truename*)) -(asdf:load-asd (merge-pathnames "gen-cl/tutorial/thrift-gen-tutorial.asd" *load-truename*)) -(asdf:load-asd (merge-pathnames "thrift-tutorial.asd" *load-truename*)) -(asdf:load-system :thrift-tutorial) - -(net.didierverna.clon:nickname-package) - -(defun main () - "Entry point for the binary." - (thrift:with-client (prot #u"thrift://127.0.0.1:9090") - (tutorial.calculator:ping prot) - (format t "ping()~%") - (format t "1 + 1 = ~a~%" (tutorial.calculator:add prot 1 1)) - (let ((work-instance (tutorial:make-work :num1 5 - :num2 0 - :op tutorial:operation.divide - :comment "Booya!"))) - (handler-case (format t - "5 / 0 = ~a - Oh, really? An exception should have been thrown here.~%" - (tutorial.calculator:calculate prot 1 work-instance)) - (tutorial:invalidoperation (e) - (format t "---~%(Expected) Invalid Operation caught: ~%~a~%---~%" e)))) - (let ((work-instance (tutorial:make-work :num1 15 - :num2 10 - :op tutorial:operation.subtract - :comment "Playing nice this time."))) - (handler-case (format t - "15 - 10 = ~a~%" - (tutorial.calculator:calculate prot 1 work-instance)) - (tutorial:invalidoperation (e) - (format t "---~%(Unexpected) Invalid Operation caught: ~%~a~%---~%" e)))) - (format t "Check log: ~a~%" (shared.shared-service:get-struct prot 1)))) - -(clon:dump "TutorialClient" main) diff --git a/tutorial/cl/make-tutorial-server.lisp b/tutorial/cl/make-tutorial-server.lisp deleted file mode 100644 index 4cf1a9026..000000000 --- a/tutorial/cl/make-tutorial-server.lisp +++ /dev/null @@ -1,29 +0,0 @@ -(in-package #:cl-user) - -;;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;;; you may not use this file except in compliance with the License. -;;;; You may obtain a copy of the License at -;;;; -;;;; http://www.apache.org/licenses/LICENSE-2.0 -;;;; -;;;; Unless required by applicable law or agreed to in writing, software -;;;; distributed under the License is distributed on an "AS IS" BASIS, -;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;;; See the License for the specific language governing permissions and -;;;; limitations under the License. - -(require "asdf") -(load (merge-pathnames "load-locally.lisp" *load-truename*)) -(asdf:load-system :net.didierverna.clon) -(asdf:load-asd (merge-pathnames "gen-cl/shared/thrift-gen-shared.asd" *load-truename*)) -(asdf:load-asd (merge-pathnames "gen-cl/tutorial/thrift-gen-tutorial.asd" *load-truename*)) -(asdf:load-asd (merge-pathnames "thrift-tutorial.asd" *load-truename*)) -(asdf:load-system :thrift-tutorial) - -(net.didierverna.clon:nickname-package) - -(defun main () - "Entry point for the binary." - (thrift:serve #u"thrift://127.0.0.1:9090" tutorial:calculator)) - -(clon:dump "TutorialServer" main) diff --git a/tutorial/cl/shared-implementation.lisp b/tutorial/cl/shared-implementation.lisp deleted file mode 100644 index c197626a5..000000000 --- a/tutorial/cl/shared-implementation.lisp +++ /dev/null @@ -1,25 +0,0 @@ -(in-package #:shared-implementation) - -;;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;;; you may not use this file except in compliance with the License. -;;;; You may obtain a copy of the License at -;;;; -;;;; http://www.apache.org/licenses/LICENSE-2.0 -;;;; -;;;; Unless required by applicable law or agreed to in writing, software -;;;; distributed under the License is distributed on an "AS IS" BASIS, -;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;;; See the License for the specific language governing permissions and -;;;; limitations under the License. - -(defvar *structs* (make-hash-table)) - -(defun shared.shared-service-implementation:get-struct (key) - (format t "getStruct(~a)~%" key) - (gethash key *structs*)) - -(defun add-log (key value) - (setf (gethash key *structs*) - (make-instance 'shared:sharedstruct - :key key - :value (write-to-string value)))) diff --git a/tutorial/cl/thrift-tutorial.asd b/tutorial/cl/thrift-tutorial.asd deleted file mode 100644 index 8a0353763..000000000 --- a/tutorial/cl/thrift-tutorial.asd +++ /dev/null @@ -1,17 +0,0 @@ -;;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;;; you may not use this file except in compliance with the License. -;;;; You may obtain a copy of the License at -;;;; -;;;; http://www.apache.org/licenses/LICENSE-2.0 -;;;; -;;;; Unless required by applicable law or agreed to in writing, software -;;;; distributed under the License is distributed on an "AS IS" BASIS, -;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;;; See the License for the specific language governing permissions and -;;;; limitations under the License. - -(asdf:defsystem #:thrift-tutorial - :depends-on (#:thrift-gen-tutorial) - :serial t - :components ((:file "shared-implementation") - (:file "tutorial-implementation"))) diff --git a/tutorial/cl/tutorial-implementation.lisp b/tutorial/cl/tutorial-implementation.lisp deleted file mode 100644 index 5c92fe405..000000000 --- a/tutorial/cl/tutorial-implementation.lisp +++ /dev/null @@ -1,41 +0,0 @@ -(in-package #:tutorial-implementation) - -;;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;;; you may not use this file except in compliance with the License. -;;;; You may obtain a copy of the License at -;;;; -;;;; http://www.apache.org/licenses/LICENSE-2.0 -;;;; -;;;; Unless required by applicable law or agreed to in writing, software -;;;; distributed under the License is distributed on an "AS IS" BASIS, -;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;;; See the License for the specific language governing permissions and -;;;; limitations under the License. - -(defun tutorial.calculator-implementation:ping () - (format t "ping()~%")) - -(defun tutorial.calculator-implementation:add (num1 num2) - (format t "add(~a, ~a)~%" num1 num2) - (+ num1 num2)) - -(defun tutorial.calculator-implementation:calculate (logid work) - (format t "calculate(~a, ~a)~%" logid work) - (handler-case - (let* ((num1 (tutorial:work-num1 work)) - (num2 (tutorial:work-num2 work)) - (op (tutorial:work-op work)) - (result - (cond - ((= op tutorial:operation.add) (+ num1 num2)) - ((= op tutorial:operation.subtract) (- num1 num2)) - ((= op tutorial:operation.multiply) (* num1 num2)) - ((= op tutorial:operation.divide) (/ num1 num2))))) - (shared-implementation::add-log logid result) - result) - (division-by-zero () (error 'tutorial:invalidoperation - :why "Division by zero." - :what-op (tutorial:work-op work))))) - -(defun tutorial.calculator-implementation:zip () - (format t "zip()~%")) -- cgit v1.2.1