Check-in [fa6376b98d]
Overview
Comment:ChromeOS: Renamed output from "cackey.crx" to "cackey.zip", which gets uploaded to the Chrome Web Store
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: fa6376b98da61cc695da12a17afcca95146c051e
User & Date: rkeene on 2016-02-26 18:23:05
Other Links: manifest | tags
Context
2016-02-26
18:35
Corrected typo in debug message check-in: b512a6df69 user: rkeene tags: trunk
18:25
Create new branch named "improve-session-and-slot-reset" check-in: 356ac541c7 user: rkeene tags: improve-session-and-slot-reset
18:23
ChromeOS: Renamed output from "cackey.crx" to "cackey.zip", which gets uploaded to the Chrome Web Store check-in: fa6376b98d user: rkeene tags: trunk
18:22
ChromeOS: Include icon in the zip file check-in: fa44d4ac0f user: rkeene tags: trunk
Changes

Modified build/chrome/Makefile from [2749a12e68] to [e9b43f227c].

26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
export PATH

ifeq (,${NACL_SDK_ROOT})
$(error "Please set NACL_SDK_ROOT")
endif
export NACL_SDK_ROOT

all: cackey.crx

cackey.crx: $(CACKEY_EXECUTABLES) cackey.nmf manifest.json cackey.js google-pcsc.js pin.html pin.js pin-icon.png icon.png
	rm -f cackey.crx
	zip cackey.crx.new $^
	mv cackey.crx.new cackey.crx

cackey.bc: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a lib/libz.a
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cackey.bc.new cackey-chrome.o cackey-chrome-init.o $(LIBS)
	mv cackey.bc.new cackey.bc

cackey.pexe: cackey.bc
	cp cackey.bc cackey.pexe.new







|

|
|
|
|







26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
export PATH

ifeq (,${NACL_SDK_ROOT})
$(error "Please set NACL_SDK_ROOT")
endif
export NACL_SDK_ROOT

all: cackey.zip

cackey.zip: $(CACKEY_EXECUTABLES) cackey.nmf manifest.json cackey.js google-pcsc.js pin.html pin.js pin-icon.png icon.png
	rm -f cackey.zip
	zip cackey.zip.new $^
	mv cackey.zip.new cackey.zip

cackey.bc: cackey-chrome.o cackey-chrome-init.o lib/libcackey.a lib/libpcsc.a lib/libz.a
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o cackey.bc.new cackey-chrome.o cackey-chrome-init.o $(LIBS)
	mv cackey.bc.new cackey.bc

cackey.pexe: cackey.bc
	cp cackey.bc cackey.pexe.new
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108

cackey-chrome.o: cackey-chrome.c cackey-chrome.h
cackey-chrome-init.o: cackey-chrome-init.cc cackey-chrome.h include/PCSC/pcsc-nacl.h

clean:
	rm -f cackey-chrome.o cackey-chrome-init.o
	rm -f cackey.pexe cackey.bc
	rm -f cackey.crx cackey.nmf
	rm -f test

distclean: clean
	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
	-rmdir lib
	rm -f include/PCSC/pcsc-nacl.h
	-rmdir include/PCSC
	-rmdir include
	rm -f google-pcsc.js
	rm -rf workdir-*

.PHONY: all clean distclean







|












89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108

cackey-chrome.o: cackey-chrome.c cackey-chrome.h
cackey-chrome-init.o: cackey-chrome-init.cc cackey-chrome.h include/PCSC/pcsc-nacl.h

clean:
	rm -f cackey-chrome.o cackey-chrome-init.o
	rm -f cackey.pexe cackey.bc
	rm -f cackey.zip cackey.nmf
	rm -f test

distclean: clean
	rm -f lib/libcackey.a lib/libpcsc.a lib/libz.a
	-rmdir lib
	rm -f include/PCSC/pcsc-nacl.h
	-rmdir include/PCSC
	-rmdir include
	rm -f google-pcsc.js
	rm -rf workdir-*

.PHONY: all clean distclean