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

fixing resource to url, now that resources are in the same directory

Browse Source
This commit is contained in:
Danny Yoo 2011-08-25 17:49:04 -04:00
parent c0ddc39c21
commit 62061b56f3
5 changed files with 33 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/using-resources.rkt
View File

@ -9,6 +9,5 @@
(image-url
(resource->url whale-resource)))
whale-resource
whale-image
whale-image

2
resource/js-impl.js
View File

@ -16,5 +16,5 @@ EXPORTS['resource->url'] = makePrimitiveProcedure(
1,
function(MACHINE) {
var resource = checkResource(MACHINE, 'resource->url', 0);
return "res/" + String(getResourceKey(resource));
return String(getResourceKey(resource));
});

115
web-world/examples/attr-animation/index.html
View File

@ -1,107 +1,8 @@
<html>
<head><title>Animation</title>
<link rel="stylesheet" href="res/style.css"/>
</head>
<body>
<p>
This should be animating:
<hr/>
<div>
<div class="selectedBlock" id="0"></div>
<div class="block" id="1"></div>
<div class="block" id="2"></div>
<div class="block" id="3"></div>
<div class="block" id="4"></div>
<div class="block" id="5"></div>
<div class="block" id="6"></div>
<div class="block" id="7"></div>
<div class="block" id="8"></div>
<div class="block" id="9"></div>
</div>
<hr/>
The program for this is:
<blockquote>
<pre>
#lang planet dyoo/whalesong
(require (planet dyoo/whalesong/resource)
(planet dyoo/whalesong/web-world))
(define-resource index.html)
(define-resource style.css)
(define (tick w v)
(modulo (add1 w) 10))
;; pick-block: world view -> view
;; Focus the view on block i.
(define (pick-block v i)
(view-focus v (format "#~a" i)))
(define (draw w v)
(define v1 (update-view-attr
(pick-block v w)
"class"
"selectedBlock"))
(define v2 (update-view-attr
(pick-block v1 (modulo (sub1 w) 10))
"class"
"offsetBlock"))
(define v3 (update-view-attr
(pick-block v2 (modulo (add1 w) 10))
"class"
"offsetBlock"))
(define v4 (update-view-attr
(pick-block v3 (modulo (- w 2) 10))
"class"
"block"))
(define v5 (update-view-attr
(pick-block v4 (modulo (+ w 2) 10))
"class"
"block"))
v5)
(big-bang 0
(initial-view index.html)
(on-tick tick)
(to-draw draw))
</pre>
</blockquote>
with <tt>style.css</tt>:
<blockquote>
<pre>
.block {
width : 80px;
height : 10px;
background-color : blue;
display: inline-block;
}
.selectedBlock {
width : 80px;
height : 10px;
background-color: navy;
display: inline-block;
}
.offsetBlock {
width : 80px;
height : 10px;
background-color: teal;
display: inline-block;
}
</pre>
</blockquote>
</p>
</body>
</html>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<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 charset="utf-8"/>
<title></title>
</head>
<script>

2
web-world/examples/hello/index.html
View File

@ -1,6 +1,6 @@
<html>
<head><title>Hello world</title>
<link rel="stylesheet" href="res/style.css"/>
<link rel="stylesheet" href="style.css"/>
</head>
<body><h1>Hello world</h1>
This is a test of the emergency broadcast system.

32
whalesong.rkt
View File

@ -5,6 +5,8 @@
racket/string
racket/match
racket/file
racket/path
racket/port
"make/make-structs.rkt"
"js-assembler/package.rkt"
"resource/structs.rkt"
@ -33,8 +35,7 @@
(define current-verbose? (make-parameter #f))
(define current-resource-dir (make-parameter
(build-path (current-directory) "res")))
(define current-resource-dir (make-parameter (build-path (current-directory))))
(define current-write-resources? (make-parameter #t))
@ -106,6 +107,11 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (same-file? p1 p2)
(or (equal? (normalize-path p1) (normalize-path p2))
(bytes=? (call-with-input-file p1 port->bytes)
(call-with-input-file p2 port->bytes))))
(define (do-the-build f)
(turn-on-logger!)
@ -120,13 +126,21 @@
(lambda (r)
(make-directory* (current-resource-dir))
(log-info (format "Writing resource ~s" (resource-path r)))
(when (file-exists? (build-path (current-resource-dir)
(resource-key r)))
(delete-file (build-path (current-resource-dir)
(resource-key r))))
(copy-file (resource-path r)
(build-path (current-resource-dir)
(resource-key r))))])
(cond
[(file-exists? (build-path (current-resource-dir)
(resource-key r)))
(cond [(same-file? (build-path (current-resource-dir)
(resource-key r))
(resource-path r))
(void)]
[else
(error 'whalesong "Unable to write resource ~s; this will overwrite a file"
(build-path (current-resource-dir)
(resource-key r)))])]
[else
(copy-file (resource-path r)
(build-path (current-resource-dir)
(resource-key r)))]))])
(call-with-output-file* output-filename
(lambda (op)
(package-standalone-xhtml