suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from vishesh/master

Browse Source 
FIX broken standalone build by ditching XHTML in favor of HTML #17
This commit is contained in:
Jens Axel Søgaard 2015-05-14 23:37:02 +02:00
commit e792c32a3a
4 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
whalesong/js-assembler/package.rkt
View File

@ -1,7 +1,6 @@
#lang racket/base #lang racket/base
(require "assemble.rkt" (require "assemble.rkt"
"quote-cdata.rkt"
"../logger.rkt" "../logger.rkt"
"../make/make.rkt" "../make/make.rkt"
"../make/make-structs.rkt" "../make/make-structs.rkt"
@ -43,7 +42,7 @@
(provide package (provide package
package-anonymous package-anonymous
package-standalone-xhtml package-standalone-html
get-inert-code get-inert-code
get-standalone-code get-standalone-code
write-standalone-code write-standalone-code
@ -506,14 +505,13 @@ M.installedModules[~s] = function() {
;; package-standalone-xhtml: X output-port -> void ;; package-standalone-html: X output-port -> void
(define (package-standalone-xhtml source-code op) (define (package-standalone-html source-code op)
(display (get-header) op) (display (get-header) op)
(display (quote-cdata (display (string-append (get-runtime)
(string-append (get-runtime) (get-inert-code source-code
(get-inert-code source-code (lambda () (error 'package-standalone-html)))
(lambda () (error 'package-standalone-xhtml))) invoke-main-module-code) op)
invoke-main-module-code)) op)
(display *footer* op)) (display *footer* op))
@ -591,7 +589,7 @@ M.installedModules[~s] = function() {
(format (format
#<<EOF #<<EOF
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <html xml:lang="en">
<head> <head>
<meta name="viewport" content="initial-scale=1.0, width=device-width, height=device-height, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <meta name="viewport" content="initial-scale=1.0, width=device-width, height=device-height, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta charset="utf-8"/> <meta charset="utf-8"/>

18
whalesong/selfhost/js-assembler/package.rkt
View File

@ -1,7 +1,6 @@
#lang racket/base #lang racket/base
(require "assemble.rkt" (require "assemble.rkt"
"quote-cdata.rkt"
"../logger.rkt" "../logger.rkt"
"../make/make.rkt" "../make/make.rkt"
"../make/make-structs.rkt" "../make/make-structs.rkt"
@ -43,7 +42,7 @@
(provide package (provide package
package-anonymous package-anonymous
package-standalone-xhtml package-standalone-html
get-inert-code get-inert-code
get-standalone-code get-standalone-code
write-standalone-code write-standalone-code
@ -506,14 +505,13 @@ M.installedModules[~s] = function() {
;; package-standalone-xhtml: X output-port -> void ;; package-standalone-html: X output-port -> void
(define (package-standalone-xhtml source-code op) (define (package-standalone-html source-code op)
(display (get-header) op) (display (get-header) op)
(display (quote-cdata (display (string-append (get-runtime)
(string-append (get-runtime) (get-inert-code source-code
(get-inert-code source-code (lambda () (error 'package-standalone-html)))
(lambda () (error 'package-standalone-xhtml))) invoke-main-module-code) op)
invoke-main-module-code)) op)
(display *footer* op)) (display *footer* op))
@ -591,7 +589,7 @@ M.installedModules[~s] = function() {
(format (format
#<<EOF #<<EOF
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <html xml:lang="en">
<head> <head>
<meta name="viewport" content="initial-scale=1.0, width=device-width, height=device-height, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <meta name="viewport" content="initial-scale=1.0, width=device-width, height=device-height, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta charset="utf-8"/> <meta charset="utf-8"/>

8
whalesong/whalesong-cmd.rkt
View File

@ -17,7 +17,7 @@
;; Usage: ;; Usage:
;; ;;
;; * Build standalone .xhtml application. ;; * Build standalone .html application.
;; ;;
;; $ whalesong build main-module-name.rkt ;; $ whalesong build main-module-name.rkt
;; ;;
@ -102,8 +102,8 @@
dest-dir dest-dir
("Set destination directory (default: current-directory)") ("Set destination directory (default: current-directory)")
(current-output-dir dest-dir)] (current-output-dir dest-dir)]
[("--as-standalone-xhtml") [("--as-standalone-html")
("Write single standalone xhtml file") ("Write single standalone html file")
(as-standalone-html? #t)] (as-standalone-html? #t)]
#:multi #:multi
[("--include-script") [("--include-script")
@ -115,7 +115,7 @@
(maybe-with-profiling (maybe-with-profiling
(if (as-standalone-html?) (if (as-standalone-html?)
(build-standalone-xhtml path) (build-standalone-html path)
(build-html-and-javascript path)))] (build-html-and-javascript path)))]
["print-il" "print the intermediate translation of a module" ["print-il" "print the intermediate translation of a module"

8
whalesong/whalesong-helpers.rkt
View File

@ -94,7 +94,7 @@
(flush-output (current-report-port))])) (flush-output (current-report-port))]))
(loop))))))) (loop)))))))
(define (build-standalone-xhtml f) (define (build-standalone-html f)
(with-catchall-exception-handler (with-catchall-exception-handler
(lambda () (lambda ()
(turn-on-logger!) (turn-on-logger!)
@ -104,7 +104,7 @@
(build-path (build-path
(regexp-replace #rx"[.](rkt|ss)$" (regexp-replace #rx"[.](rkt|ss)$"
(path->string filename) (path->string filename)
".xhtml"))]) ".html"))])
(unless (directory-exists? (current-output-dir)) (unless (directory-exists? (current-output-dir))
(fprintf (current-report-port) "Creating destination directory ~s\n" (current-output-dir)) (fprintf (current-report-port) "Creating destination directory ~s\n" (current-output-dir))
(make-directory* (current-output-dir))) (make-directory* (current-output-dir)))
@ -129,10 +129,10 @@
(build-path (current-output-dir) (build-path (current-output-dir)
(resource-key r)))]))]) (resource-key r)))]))])
(fprintf (current-report-port) (fprintf (current-report-port)
(format "Writing program ~s\n" (build-path (current-output-port) output-filename))) (format "Writing program ~s\n" (build-path (current-output-dir) output-filename)))
(call-with-output-file* (build-path (current-output-dir) output-filename) (call-with-output-file* (build-path (current-output-dir) output-filename)
(lambda (op) (lambda (op)
(package-standalone-xhtml (package-standalone-html
(make-MainModuleSource (make-MainModuleSource
(normalize-path (build-path f))) (normalize-path (build-path f)))
op)) op))