Permalink
Browse files

fixed line endings

  • Loading branch information...
taxilian committed Sep 28, 2012
1 parent 31857ad commit d4ce2c6d3e7ab079af76758e5463c10f4bda24cd
Showing with 125 additions and 125 deletions.
  1. +35 −35 cmake/xpi.cmake
  2. +1 −1 src/3rdParty/boost
  3. +89 −89 src/PluginCore/PluginEvents/X11NativeGdkEvent.h
View
@@ -1,35 +1,35 @@
-# Build a signed XPI package to distribute the plugin
-# 2012/01 Geoffroy Couprie geoffroy.couprie@loginpeople.com
-
-function (add_signed_xpi_installer PROJNAME XPI_OUTDIR DLLFILE XPISIGNERPATH PFXFILE PASSFILE XPI_PROJDEP)
- message(STATUS "CONFIGURING XPI PACKAGING")
- set (XPI_SOURCES
- ${FB_ROOT}/cmake/dummy.cpp
- )
- if (NOT FB_XPI_SUFFIX)
- set (FB_XPI_SUFFIX _XPI)
- endif()
- ADD_LIBRARY(${PROJNAME}${FB_XPI_SUFFIX} STATIC ${XPI_SOURCES})
-
- if (NOT "${PASSFILE}" STREQUAL "")
- file(STRINGS "${PASSFILE}" PASSPHRASE LIMIT_COUNT 1)
- endif()
-
- #Replace the plugin version in the install.rdf template
- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen/${FBSTRING_PluginFileName}-xpi)
- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xpi/content/chrome.manifest DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gen/${FBSTRING_PluginFileName}-xpi)
- configure_template(${CMAKE_CURRENT_SOURCE_DIR}/xpi/content/install.rdf ${CMAKE_CURRENT_BINARY_DIR}/gen/${FBSTRING_PluginFileName}-xpi/install.rdf)
-
- add_custom_command(
- TARGET ${PROJNAME}${FB_XPI_SUFFIX}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory "\"${CMAKE_CURRENT_BINARY_DIR}/gen/${FBSTRING_PluginFileName}-xpi\"" "\"${XPI_OUTDIR}/${FBSTRING_PluginFileName}/\""
- COMMAND mkdir "\"${XPI_OUTDIR}/${FBSTRING_PluginFileName}/plugins/\""
- COMMAND ${CMAKE_COMMAND} -E copy "${DLLFILE}" "\"${XPI_OUTDIR}/${FBSTRING_PluginFileName}/plugins/\""
- COMMAND java -jar ${XPISIGNERPATH} ${PFXFILE} ${PASSPHRASE} "${XPI_OUTDIR}/${FBSTRING_PluginFileName}" "${XPI_OUTDIR}/${FBSTRING_PluginFileName}.xpi"
- COMMAND popd
- COMMAND ${CMAKE_COMMAND} -E remove_directory "${XPI_OUTDIR}/${FBSTRING_PluginFileName}"
- )
- ADD_DEPENDENCIES(${PROJNAME}${FB_XPI_SUFFIX} ${XPI_PROJDEP})
-
-endfunction(add_signed_xpi_installer)
+# Build a signed XPI package to distribute the plugin
+# 2012/01 Geoffroy Couprie geoffroy.couprie@loginpeople.com
+
+function (add_signed_xpi_installer PROJNAME XPI_OUTDIR DLLFILE XPISIGNERPATH PFXFILE PASSFILE XPI_PROJDEP)
+ message(STATUS "CONFIGURING XPI PACKAGING")
+ set (XPI_SOURCES
+ ${FB_ROOT}/cmake/dummy.cpp
+ )
+ if (NOT FB_XPI_SUFFIX)
+ set (FB_XPI_SUFFIX _XPI)
+ endif()
+ ADD_LIBRARY(${PROJNAME}${FB_XPI_SUFFIX} STATIC ${XPI_SOURCES})
+
+ if (NOT "${PASSFILE}" STREQUAL "")
+ file(STRINGS "${PASSFILE}" PASSPHRASE LIMIT_COUNT 1)
+ endif()
+
+ #Replace the plugin version in the install.rdf template
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen/${FBSTRING_PluginFileName}-xpi)
+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xpi/content/chrome.manifest DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gen/${FBSTRING_PluginFileName}-xpi)
+ configure_template(${CMAKE_CURRENT_SOURCE_DIR}/xpi/content/install.rdf ${CMAKE_CURRENT_BINARY_DIR}/gen/${FBSTRING_PluginFileName}-xpi/install.rdf)
+
+ add_custom_command(
+ TARGET ${PROJNAME}${FB_XPI_SUFFIX}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_directory "\"${CMAKE_CURRENT_BINARY_DIR}/gen/${FBSTRING_PluginFileName}-xpi\"" "\"${XPI_OUTDIR}/${FBSTRING_PluginFileName}/\""
+ COMMAND mkdir "\"${XPI_OUTDIR}/${FBSTRING_PluginFileName}/plugins/\""
+ COMMAND ${CMAKE_COMMAND} -E copy "${DLLFILE}" "\"${XPI_OUTDIR}/${FBSTRING_PluginFileName}/plugins/\""
+ COMMAND java -jar ${XPISIGNERPATH} ${PFXFILE} ${PASSPHRASE} "${XPI_OUTDIR}/${FBSTRING_PluginFileName}" "${XPI_OUTDIR}/${FBSTRING_PluginFileName}.xpi"
+ COMMAND popd
+ COMMAND ${CMAKE_COMMAND} -E remove_directory "${XPI_OUTDIR}/${FBSTRING_PluginFileName}"
+ )
+ ADD_DEPENDENCIES(${PROJNAME}${FB_XPI_SUFFIX} ${XPI_PROJDEP})
+
+endfunction(add_signed_xpi_installer)
@@ -1,89 +1,89 @@
-/**********************************************************\
-File: X11NativeGdkEvent.h
-
-Original Author: John Boyd (medusade)
-
-Created: 5/4/2012
-License: Dual license model; choose one of two:
- New BSD License
- http://www.opensource.org/licenses/bsd-license.php
- - or -
- GNU Lesser General Public License, version 2.1
- http://www.gnu.org/licenses/lgpl-2.1.html
-
-Copyright John Boyd (medusade), Firebreath development team
-\**********************************************************/
-#pragma once
-#ifndef H_FB_EVENTS_X11NATIVEGDKEVENT
-#define H_FB_EVENTS_X11NATIVEGDKEVENT
-
-#include <gdk/gdk.h>
-
-namespace FB {
-
-///////////////////////////////////////////////////////////////////////
-/// @class X11NativeGdkEvent
-///
-/// @author John Boyd (medusade)
-/// @date 5/4/2012
-///
-/// @brief Class encapsulation for native Gdk event
-///////////////////////////////////////////////////////////////////////
-class X11NativeGdkEvent
-{
-public:
- GdkEvent m_gdkEvent;
-
- X11NativeGdkEvent
- (GdkWindow* window=0, GdkEventType type=GDK_NOTHING, gint8 send_event=TRUE)
- {
- m_gdkEvent.any.type = type;
- m_gdkEvent.any.window = window;
- m_gdkEvent.any.send_event = send_event;
- }
- bool SendEvent()
- {
- bool sent = false;
- if ((sent = (m_gdkEvent.any.type != GDK_NOTHING) && (m_gdkEvent.any.window != 0)))
- {
- gdk_threads_enter();
- gdk_event_put(&m_gdkEvent);
- gdk_threads_leave();
- }
- return sent;
- }
- inline operator GdkEvent* () const
- { return (GdkEvent*)(&m_gdkEvent); }
-};
-
-///////////////////////////////////////////////////////////////////////
-/// @class X11NativeGdkEventExpose
-///
-/// @author John Boyd (medusade)
-/// @date 5/4/2012
-///
-/// @brief Class encapsulation for native Gdk expose event
-///////////////////////////////////////////////////////////////////////
-class X11NativeGdkEventExpose: public X11NativeGdkEvent
-{
-public:
- typedef X11NativeGdkEvent Extends;
-
- X11NativeGdkEventExpose
- (GdkWindow* window=0, GdkRegion* region=0,
- int x=0, int y=0, int width=0, int height=0, int count=0,
- GdkEventType type=GDK_EXPOSE, gint8 send_event=TRUE)
- : Extends(window, type, send_event)
- {
- m_gdkEvent.expose.area.x = x;
- m_gdkEvent.expose.area.y = y;
- m_gdkEvent.expose.area.width = width;
- m_gdkEvent.expose.area.height = height;
- m_gdkEvent.expose.region = region;
- m_gdkEvent.expose.count = count;
- }
-};
-
-} // namespace FB
-
-#endif // H_FB_EVENTS_X11NATIVEGDKEVENT
+/**********************************************************\
+File: X11NativeGdkEvent.h
+
+Original Author: John Boyd (medusade)
+
+Created: 5/4/2012
+License: Dual license model; choose one of two:
+ New BSD License
+ http://www.opensource.org/licenses/bsd-license.php
+ - or -
+ GNU Lesser General Public License, version 2.1
+ http://www.gnu.org/licenses/lgpl-2.1.html
+
+Copyright John Boyd (medusade), Firebreath development team
+\**********************************************************/
+#pragma once
+#ifndef H_FB_EVENTS_X11NATIVEGDKEVENT
+#define H_FB_EVENTS_X11NATIVEGDKEVENT
+
+#include <gdk/gdk.h>
+
+namespace FB {
+
+///////////////////////////////////////////////////////////////////////
+/// @class X11NativeGdkEvent
+///
+/// @author John Boyd (medusade)
+/// @date 5/4/2012
+///
+/// @brief Class encapsulation for native Gdk event
+///////////////////////////////////////////////////////////////////////
+class X11NativeGdkEvent
+{
+public:
+ GdkEvent m_gdkEvent;
+
+ X11NativeGdkEvent
+ (GdkWindow* window=0, GdkEventType type=GDK_NOTHING, gint8 send_event=TRUE)
+ {
+ m_gdkEvent.any.type = type;
+ m_gdkEvent.any.window = window;
+ m_gdkEvent.any.send_event = send_event;
+ }
+ bool SendEvent()
+ {
+ bool sent = false;
+ if ((sent = (m_gdkEvent.any.type != GDK_NOTHING) && (m_gdkEvent.any.window != 0)))
+ {
+ gdk_threads_enter();
+ gdk_event_put(&m_gdkEvent);
+ gdk_threads_leave();
+ }
+ return sent;
+ }
+ inline operator GdkEvent* () const
+ { return (GdkEvent*)(&m_gdkEvent); }
+};
+
+///////////////////////////////////////////////////////////////////////
+/// @class X11NativeGdkEventExpose
+///
+/// @author John Boyd (medusade)
+/// @date 5/4/2012
+///
+/// @brief Class encapsulation for native Gdk expose event
+///////////////////////////////////////////////////////////////////////
+class X11NativeGdkEventExpose: public X11NativeGdkEvent
+{
+public:
+ typedef X11NativeGdkEvent Extends;
+
+ X11NativeGdkEventExpose
+ (GdkWindow* window=0, GdkRegion* region=0,
+ int x=0, int y=0, int width=0, int height=0, int count=0,
+ GdkEventType type=GDK_EXPOSE, gint8 send_event=TRUE)
+ : Extends(window, type, send_event)
+ {
+ m_gdkEvent.expose.area.x = x;
+ m_gdkEvent.expose.area.y = y;
+ m_gdkEvent.expose.area.width = width;
+ m_gdkEvent.expose.area.height = height;
+ m_gdkEvent.expose.region = region;
+ m_gdkEvent.expose.count = count;
+ }
+};
+
+} // namespace FB
+
+#endif // H_FB_EVENTS_X11NATIVEGDKEVENT

0 comments on commit d4ce2c6

Please sign in to comment.