Changeset 495

Timestamp:

01/13/09 19:00:15 (10 months ago)

Author:

jdecq

Message:

Prep for a dev build with no jar

Files:

• trunk/uploadr/Makefile (modified) (7 diffs)
• trunk/uploadr/win_installer/build_dev.nsi (added)

trunk/uploadr/Makefile

@@ -132 +132 @@
-        @echo "  packaging, mar: Build a single package or update but requires"
-        @echo "              de-de, en-US, es-us, fr-fr, it-it, ko-kr, pt-br, or zh-hk"
+        @echo "              dev for development build: i.e. unjared content"
-
-all: all-build all-mar
@@ -181 +182 @@
-ja-jp:
-        @echo "Building Japanese (ja-jp)"
+dev:
+        @echo "Development Build"
-
-packaging:
@@ -255 +258 @@
-        mkdir $(BUILD)/jar/content
-        mkdir $(BUILD)/jar/content/uploadr
-
+
+
-        mkdir $(BUILD)/jar/content/hacks
-ifeq (mac, $(PLATFORM))
@@ -277 +281 @@
-        mkdir $(BUILD)/jar/locale/$(INTL)
-        cp $(SRC)/Resources/chrome/locale/$(INTL)/*.* $(BUILD)/jar/locale/$(INTL)/
+ifeq (dev, $(filter dev, $(MAKECMDGOALS)))
+        sed 's/en-US/$(INTL)/g' $(SRC)/Resources/chrome/chrome.manifest > \
+                $(RES)/chrome/chrome.manifest
+else
-        sed 's/en-US/$(INTL)/g' $(SRC)/Resources/chrome/chrome.manifest.prod > \
-                $(RES)/chrome/chrome.manifest
+endif
-        mkdir $(BUILD)/jar/skin
-#ifeq (mac, $(PLATFORM))
@@ -297 +306 @@
-        cp $(SRC)/Resources/chrome/skin/uploadr/*.gif $(BUILD)/jar/skin/uploadr/
-        cp $(SRC)/Resources/chrome/skin/uploadr/*.png $(BUILD)/jar/skin/uploadr/
+
+ifeq (dev, $(filter dev, $(MAKECMDGOALS)))
+        cd $(BUILD)/jar/ && mv content $(RES)/chrome/ && mv locale $(RES)/chrome/ && mv skin $(RES)/chrome/
+else
-ifeq (win, $(PLATFORM))
-        cd $(BUILD)/jar/ && zip uploadr.zip -r content locale skin
@@ -303 +316 @@
-endif
-        mv $(BUILD)/jar/uploadr.zip $(RES)/chrome/uploadr.jar
+endif
-        rm -rf $(BUILD)/jar
-
@@ -353 +367 @@
-                $(BUILD)/config.ini
-        rm $(BUILD)/config-temp.ini
-
+
+
+
+
+
-        perl win_installer/utf16.pl \
-                win_installer/build.nsi > \
-                $(BUILD)/build.nsi
-
+
-        cp win_installer/vcredist_x86.exe $(BUILD)/vcredist_x86.exe
-