diff --git a/Makefile b/Makefile
index bdb80da1..ca5ee9e9 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,15 @@ ZIP_EXCLUDE= -x rooibos/**\* -x xml/* -x artwork/* -x \*.pkg -x storeassets\* -x
include app.mk
+dev:
+ $(MAKE) BUILD='dev' package
+
+beta:
+ $(MAKE) BUILD='beta' package
+
+release:
+ $(MAKE) BUILD='release' package
+
test: prep_staging prep_tests remove install
echo "Running tests"
diff --git a/app.mk b/app.mk
index 75c0a3aa..ded307e8 100644
--- a/app.mk
+++ b/app.mk
@@ -27,6 +27,8 @@
# associated with the rokudev account.
##########################################################################
+BUILD = dev
+
DISTREL = $(shell pwd)/out
COMMONREL ?= $(shell pwd)/common
SOURCEREL = $(shell pwd)
@@ -102,6 +104,7 @@ prep_staging:
chmod -R 755 $(STAGINGREL); \
echo " >> moving application to $(STAGINGREL)"
+ cp $(SOURCEREL)/manifest $(STAGINGREL)/manifest
cp -r $(SOURCEREL)/source $(STAGINGREL)
cp -r $(SOURCEREL)/components $(STAGINGREL)
cp -r $(SOURCEREL)/images $(STAGINGREL)
@@ -110,9 +113,12 @@ prep_staging:
mkdir $(STAGINGREL)/locale
cp -r $(foreach f,$(SUPPORTED_LOCALES),$(SOURCEREL)/locale/$f) $(STAGINGREL)/locale
- cp $(SOURCEREL)/manifest $(STAGINGREL)/manifest
+ifneq ($(BUILD), dev)
+ echo "COPYING $(BUILD)"
+ cp $(SOURCEREL)/resources/branding/$(BUILD)/* $(STAGINGREL)/images
+endif
-package: prep_staging
+package: prep_staging
@echo "*** Creating $(APPNAME).zip ***"
@echo " >> copying imports"
@if [ "$(IMPORTFILES)" ]; \
@@ -137,12 +143,12 @@ package: prep_staging
# zip .png files without compression
# do not zip up any files ending with '~'
- @echo " >> creating application zip $(STAGINGREL)/../apps/$(APPNAME).zip"
+ @echo " >> creating application zip $(STAGINGREL)/../apps/$(APPNAME)-$(BUILD).zip"
@if [ -d $(STAGINGREL) ]; \
then \
cd $(STAGINGREL); \
- (zip -0 -r "../apps/$(APPNAME).zip" . -i \*.png $(ZIP_EXCLUDE)); \
- (zip -9 -r "../apps/$(APPNAME).zip" . -x \*~ -x \*.png $(ZIP_EXCLUDE)); \
+ (zip -0 -r "../apps/$(APPNAME)-$(BUILD).zip" . -i \*.png $(ZIP_EXCLUDE)); \
+ (zip -9 -r "../apps/$(APPNAME)-$(BUILD).zip" . -x \*~ -x \*.png $(ZIP_EXCLUDE)); \
cd $(SOURCEREL);\
else \
echo "Source for $(APPNAME) not found at $(STAGINGREL)"; \
@@ -154,7 +160,7 @@ package: prep_staging
rm -r -f $(APPSOURCEDIR)/common; \
fi \
- @echo "*** packaging $(APPNAME) complete ***"
+ @echo "*** packaging $(APPNAME)-$(BUILD) complete ***"
prep_tests:
@mkdir -p $(STAGINGREL)/components/tests/; \
@@ -164,8 +170,8 @@ prep_tests:
./node_modules/.bin/rooibos-cli i tests/.rooibosrc.json
install: prep_staging package home
- @echo "Installing $(APPNAME) to host $(ROKU_DEV_TARGET)"
- @$(CURLCMD) --user $(USERPASS) --digest -F "mysubmit=Install" -F "archive=@$(ZIPREL)/$(APPNAME).zip" -F "passwd=" http://$(ROKU_DEV_TARGET)/plugin_install | grep "//" | sed "s[[["
+ @echo "Installing $(APPNAME)-$(BUILD) to host $(ROKU_DEV_TARGET)"
+ @$(CURLCMD) --user $(USERPASS) --digest -F "mysubmit=Install" -F "archive=@$(ZIPREL)/$(APPNAME)-$(BUILD).zip" -F "passwd=" http://$(ROKU_DEV_TARGET)/plugin_install | grep "//" | sed "s[[["
remove:
@echo "Removing $(APPNAME) from host $(ROKU_DEV_TARGET)"
diff --git a/images/channel-poster_fhd.png b/images/channel-poster_fhd.png
index c4160de2..6a5ed7ad 100644
Binary files a/images/channel-poster_fhd.png and b/images/channel-poster_fhd.png differ
diff --git a/images/channel-poster_hd.png b/images/channel-poster_hd.png
index 6177714c..9d23a46d 100644
Binary files a/images/channel-poster_hd.png and b/images/channel-poster_hd.png differ
diff --git a/images/channel-poster_sd.png b/images/channel-poster_sd.png
index 85e7ed8f..2c84e616 100644
Binary files a/images/channel-poster_sd.png and b/images/channel-poster_sd.png differ
diff --git a/images/logo.png b/images/logo.png
index 3df222d4..8bf975bd 100644
Binary files a/images/logo.png and b/images/logo.png differ
diff --git a/images/splash-screen_fhd.jpg b/images/splash-screen_fhd.jpg
deleted file mode 100644
index ace7443f..00000000
Binary files a/images/splash-screen_fhd.jpg and /dev/null differ
diff --git a/images/splash-screen_fhd.png b/images/splash-screen_fhd.png
new file mode 100644
index 00000000..140bed4b
Binary files /dev/null and b/images/splash-screen_fhd.png differ
diff --git a/images/splash-screen_hd.jpg b/images/splash-screen_hd.jpg
deleted file mode 100644
index 9da8c93f..00000000
Binary files a/images/splash-screen_hd.jpg and /dev/null differ
diff --git a/images/splash-screen_hd.png b/images/splash-screen_hd.png
new file mode 100644
index 00000000..be2c5e9d
Binary files /dev/null and b/images/splash-screen_hd.png differ
diff --git a/images/splash-screen_sd.jpg b/images/splash-screen_sd.jpg
deleted file mode 100644
index d5902472..00000000
Binary files a/images/splash-screen_sd.jpg and /dev/null differ
diff --git a/images/splash-screen_sd.png b/images/splash-screen_sd.png
new file mode 100644
index 00000000..5402410f
Binary files /dev/null and b/images/splash-screen_sd.png differ
diff --git a/manifest b/manifest
index 02f21f4a..817fdee9 100644
--- a/manifest
+++ b/manifest
@@ -10,9 +10,9 @@ mm_icon_focus_hd=pkg:/images/channel-poster_hd.png
mm_icon_focus_sd=pkg:/images/channel-poster_sd.png
### Splash Screen + Loading Screen Artwork
-splash_screen_fhd=pkg:/images/splash-screen_fhd.jpg
-splash_screen_hd=pkg:/images/splash-screen_hd.jpg
-splash_screen_sd=pkg:/images/splash-screen_sd.jpg
+splash_screen_fhd=pkg:/images/splash-screen_fhd.png
+splash_screen_hd=pkg:/images/splash-screen_hd.png
+splash_screen_sd=pkg:/images/splash-screen_sd.png
splash_min_time=1500
diff --git a/resources/branding/beta/channel-poster_fhd.png b/resources/branding/beta/channel-poster_fhd.png
new file mode 100644
index 00000000..6fcc6717
Binary files /dev/null and b/resources/branding/beta/channel-poster_fhd.png differ
diff --git a/resources/branding/beta/channel-poster_hd.png b/resources/branding/beta/channel-poster_hd.png
new file mode 100644
index 00000000..f2208981
Binary files /dev/null and b/resources/branding/beta/channel-poster_hd.png differ
diff --git a/resources/branding/beta/channel-poster_sd.png b/resources/branding/beta/channel-poster_sd.png
new file mode 100644
index 00000000..962cbc19
Binary files /dev/null and b/resources/branding/beta/channel-poster_sd.png differ
diff --git a/resources/branding/beta/logo.png b/resources/branding/beta/logo.png
new file mode 100644
index 00000000..26b9b78a
Binary files /dev/null and b/resources/branding/beta/logo.png differ
diff --git a/resources/branding/beta/splash-screen_fhd.png b/resources/branding/beta/splash-screen_fhd.png
new file mode 100644
index 00000000..133835e8
Binary files /dev/null and b/resources/branding/beta/splash-screen_fhd.png differ
diff --git a/resources/branding/beta/splash-screen_hd.png b/resources/branding/beta/splash-screen_hd.png
new file mode 100644
index 00000000..8da1a6c8
Binary files /dev/null and b/resources/branding/beta/splash-screen_hd.png differ
diff --git a/resources/branding/beta/splash-screen_sd.png b/resources/branding/beta/splash-screen_sd.png
new file mode 100644
index 00000000..8141b5b3
Binary files /dev/null and b/resources/branding/beta/splash-screen_sd.png differ
diff --git a/resources/branding/release/channel-poster_fhd.png b/resources/branding/release/channel-poster_fhd.png
new file mode 100644
index 00000000..0861e111
Binary files /dev/null and b/resources/branding/release/channel-poster_fhd.png differ
diff --git a/resources/branding/release/channel-poster_hd.png b/resources/branding/release/channel-poster_hd.png
new file mode 100644
index 00000000..1267fa30
Binary files /dev/null and b/resources/branding/release/channel-poster_hd.png differ
diff --git a/resources/branding/release/channel-poster_sd.png b/resources/branding/release/channel-poster_sd.png
new file mode 100644
index 00000000..4226b6ed
Binary files /dev/null and b/resources/branding/release/channel-poster_sd.png differ
diff --git a/resources/branding/release/logo.png b/resources/branding/release/logo.png
new file mode 100644
index 00000000..eb4b38e8
Binary files /dev/null and b/resources/branding/release/logo.png differ
diff --git a/resources/branding/release/splash-screen_fhd.png b/resources/branding/release/splash-screen_fhd.png
new file mode 100644
index 00000000..e6bdf9ef
Binary files /dev/null and b/resources/branding/release/splash-screen_fhd.png differ
diff --git a/resources/branding/release/splash-screen_hd.png b/resources/branding/release/splash-screen_hd.png
new file mode 100644
index 00000000..cc7776ce
Binary files /dev/null and b/resources/branding/release/splash-screen_hd.png differ
diff --git a/resources/branding/release/splash-screen_sd.png b/resources/branding/release/splash-screen_sd.png
new file mode 100644
index 00000000..4ed05367
Binary files /dev/null and b/resources/branding/release/splash-screen_sd.png differ