Skip to content

app.nit: fix issues in examples and calculator #2579

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.

Sign up for GitHub

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

Merged
privat merged 3 commits into from
Nov 23, 2017
Merged

app.nit: fix issues in examples and calculator #2579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5922974
app.nit examples: update http_request_example to correctly define the…
xymus Nov 14, 2017
5f213a9
app.nit examples: fix dependencies by adding the missing -m to nitls …
xymus Nov 9, 2017
10a8a64
calculator: add the scientific variant to the `all` Makefile rule
xymus Nov 14, 2017
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
6 changes: 3 additions & 3 deletions contrib/tnitter/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bin/tnitter_server: $(shell nitls -M src/tnitter.nit)
mkdir -p bin/
nitc -o bin/tnitter_server src/tnitter.nit -D tnitter_interface=$(SERVER)

bin/tnitter: $(shell nitls -M src/tnitter_app.nit)
bin/tnitter: $(shell nitls -M src/tnitter_app.nit -m linux)
mkdir -p bin/
nitc -o bin/tnitter src/tnitter_app.nit -m linux -D tnitter_server_uri=http://$(SERVER)

Expand All @@ -30,11 +30,11 @@ android/res/: art/icon.svg
# iOS

ios: bin/tnitter.app
bin/tnitter.app: $(shell nitls -M src/tnitter_app.nit ios) ios/AppIcon.appiconset/Contents.json
bin/tnitter.app: $(shell nitls -M src/tnitter_app.nit -m ios) ios/AppIcon.appiconset/Contents.json
mkdir -p bin/
nitc -o bin/tnitter.app src/tnitter_app.nit -m ios -D tnitter_server_uri=http://$(SERVER)

ios-release: $(shell nitls -M src/tnitter_app.nit ios) ios/AppIcon.appiconset/Contents.json
ios-release: $(shell nitls -M src/tnitter_app.nit -m ios) ios/AppIcon.appiconset/Contents.json
mkdir -p bin/
nitc -o bin/tnitter.app src/tnitter_app.nit -m ios -D tnitter_server_uri=http://tnitter.xymus.net

Expand Down
14 changes: 7 additions & 7 deletions examples/calculator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
NITC=../../bin/nitc
NITLS=../../bin/nitls

all: bin/calculator bin/test
all: bin/calculator bin/scientific bin/test

bin/calculator: $(shell ${NITLS} -M src/calculator.nit linux) ${NITC}
bin/calculator: $(shell ${NITLS} -M src/calculator.nit -m linux) ${NITC}
mkdir -p bin
${NITC} -o $@ src/calculator.nit -m linux

bin/scientific: $(shell ${NITLS} -M scientific linux) ${NITC}
bin/scientific: $(shell ${NITLS} -M scientific -m linux) ${NITC}
mkdir -p bin
${NITC} -o $@ src/scientific -m linux

Expand All @@ -28,15 +28,15 @@ bin/calculator21.apk: $(shell ${NITLS} -M src/android21) ${NITC} android/res/dra
mkdir -p bin
${NITC} -o $@ src/android21 -D debug

bin/scientific14.apk: $(shell ${NITLS} -M src/scientific src/android14.nit) ${NITC} src/scientific/android/res/drawable-hdpi/icon.png
bin/scientific14.apk: $(shell ${NITLS} -M src/scientific -m src/android14.nit) ${NITC} src/scientific/android/res/drawable-hdpi/icon.png
mkdir -p bin
${NITC} -o $@ src/scientific -m src/android14.nit -D debug

bin/scientific21.apk: $(shell ${NITLS} -M src/scientific src/android21) ${NITC} src/scientific/android/res/drawable-hdpi/icon.png
bin/scientific21.apk: $(shell ${NITLS} -M src/scientific -m src/android21) ${NITC} src/scientific/android/res/drawable-hdpi/icon.png
mkdir -p bin
${NITC} -o $@ src/scientific -m src/android21 -D debug

android-release: $(shell ${NITLS} -M src/scientific src/android14.nit) ${NITC} android/res/drawable-hdpi/icon.png
android-release: $(shell ${NITLS} -M src/scientific -m src/android14.nit) ${NITC} android/res/drawable-hdpi/icon.png
mkdir -p bin
${NITC} -o bin/calculator14.apk src/android14.nit --release
${NITC} -o bin/calculator21.apk src/android21 --release
Expand Down Expand Up @@ -66,7 +66,7 @@ bin/calculator.app: $(shell ${NITLS} -M src/ios.nit) ${NITC} ios/AppIcon.appicon
mkdir -p bin
${NITC} -o $@ src/ios.nit -D debug

bin/scientific.app: $(shell ${NITLS} -M src/scientific src/ios.nit) ${NITC} src/scientific/ios/AppIcon.appiconset/Contents.json
bin/scientific.app: $(shell ${NITLS} -M src/scientific -m src/ios.nit) ${NITC} src/scientific/ios/AppIcon.appiconset/Contents.json
mkdir -p bin
${NITC} -o $@ src/scientific -m src/ios.nit -D debug

Expand Down
12 changes: 6 additions & 6 deletions lib/app/examples/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ android: http_request_example.apk ui_example.apk

ios: http_request_example.app ui_example.app

http_request_example: $(shell nitls -M http_request_example.nit linux)
http_request_example: $(shell nitls -M http_request_example.nit -m linux)
nitc http_request_example.nit -m linux

http_request_example.apk: $(shell nitls -M http_request_example.nit android)
http_request_example.apk: $(shell nitls -M http_request_example.nit -m android)
nitc http_request_example.nit -m android

http_request_example.app: $(shell nitls -M http_request_example.nit ios)
http_request_example.app: $(shell nitls -M http_request_example.nit -m ios)
nitc http_request_example.nit -m ios

ui_example: $(shell nitls -M ui_example.nit linux)
ui_example: $(shell nitls -M ui_example.nit -m linux)
nitc ui_example.nit -m linux

ui_example.apk: $(shell nitls -M ui_example.nit android)
ui_example.apk: $(shell nitls -M ui_example.nit -m android)
nitc ui_example.nit -m android

ui_example.app: $(shell nitls -M ui_example.nit ios)
ui_example.app: $(shell nitls -M ui_example.nit -m ios)
nitc ui_example.nit -m ios

clean:
Expand Down
11 changes: 2 additions & 9 deletions lib/app/examples/http_request_example.nit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class MyHttpRequest
redef fun after do win.button_request.enabled = true
end

# Simpe window with a label and a button
# Simple window with a label and a button
class HttpRequestClientWindow
super Window

Expand All @@ -81,11 +81,4 @@ class HttpRequestClientWindow
end
end

redef class App
redef fun on_create
do
# Create the main window
push_window new HttpRequestClientWindow
super
end
end
redef fun root_window do return new HttpRequestClientWindow