Changeset 2525

Timestamp:

10/31/08 10:38:29 (2 months ago)

Author:

ahodgkinson

Message:

digitalme: Build script cleanup. Also minimized diagnostic messages in the Firefox extension.

Location:

trunk/digitalme/launchers

Files:

• firefox-addon/CMakeLists.txt (modified) (2 diffs)
• firefox-addon/xul/chrome/content/IdentitySelector.js (modified) (10 diffs)
• java/CMakeLists.txt (modified) (1 diff)

trunk/digitalme/launchers/firefox-addon/CMakeLists.txt

@@ -41 +41 @@
 set( CMAKE_MODULE_PATH "${FTK_DIR}/CMakeModules")
 
-# Default install prefix
+# Non-native project
 
-if( UNIX)
-        set( PRODUCT_INSTALL_PREFIX /usr)
-endif( UNIX)
-
-# Set the project version
-
-if( NOT PROJECT_VERSION)
-        include( FindSubversion OPTIONAL)
-        
-        if( Subversion_FOUND)
-                Subversion_WC_INFO( ${PROJECT_SOURCE_DIR} PROJECT)
-        endif( Subversion_FOUND)
-        
-        if( NOT PROJECT_WC_REVISION)
-                message( "Unable to determine subversion revision")
-                set( PROJECT_WC_REVISION 999999)
-        endif( NOT PROJECT_WC_REVISION)
-        
-        message( STATUS "Current subversion revision is ${PROJECT_WC_REVISION}")
-        
-        set( PROJECT_MAJOR_VERSION 0)
-        set( PROJECT_MINOR_VERSION 5)
-        set( PROJECT_REVISION ${PROJECT_WC_REVISION})
-        set( PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION}")
-endif( NOT PROJECT_VERSION)
-
-message( STATUS "Current project version is ${PROJECT_VERSION}")
+set( NON_NATIVE_TARGET TRUE)
 
 # Common configuration
@@ -80 +54 @@
         "Output directory for package staging.")
 set( INSTALL_RDF_FILE ${PACKAGE_STAGE_DIR}/install.rdf)
-
-# Build type
-
-if( CMAKE_BUILD_TYPE STREQUAL "Debug")
-        set( CMAKE_BUILD_TYPE Debug)
-        set( DEBUG_BUILD TRUE)
-endif( CMAKE_BUILD_TYPE STREQUAL "Debug")
-
-#set( CMAKE_VERBOSE_MAKEFILE TRUE)
 
 # install.rdf

trunk/digitalme/launchers/firefox-addon/xul/chrome/content/IdentitySelector.js

@@ -53 +53 @@
 var gLastFailedGetTokenDate = null;
 var gDisableStartTime = null;
+var gDebugMode = false;
 
 // **************************************************************************
@@ -155 +156 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "onLocationChange", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "onLocationChange", e);
+                        }
                 }
                 
@@ -495 +499 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "onDOMChanged", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "onDOMChanged", e);
+                        }
                 }
         },
@@ -570 +577 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "onProcessItems", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "onProcessItems", e);
+                        }
                 }
         },
@@ -639 +649 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "processICardItems", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "processICardItems", e);
+                        }
                 }
         },
@@ -748 +761 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "setParamsFromElem", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "setParamsFromElem", e);
+                        }
                 }
         },
@@ -871 +887 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "onFormSubmit", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "onFormSubmit", e);
+                        }
                 }
         },
@@ -1029 +1048 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "onDOMChanged", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "onDOMChanged", e);
+                        }
                 }
         },
@@ -1124 +1146 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "onICardObjectLoaded", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "onICardObjectLoaded", e);
+                        }
                 }
                 
@@ -1203 +1228 @@
                 catch( e)
                 {
-                        IdentitySelector.reportError( "onICardElementLoaded", e);
+                        if( gDebugMode)
+                        {
+                                IdentitySelector.reportError( "onICardElementLoaded", e);
+                        }
                 }
         },

trunk/digitalme/launchers/java/CMakeLists.txt

@@ -41 +41 @@
 
 find_package( Java)
-set( JAVA_TARGET TRUE)
+set( NON_NATIVE_TARGET TRUE)
 
 # Include the local modules directory