CMakeLists.txt

@@ -83,6 +83,12 @@ MACRO(ADD_NEKTAR_TUTORIAL)
                 COMMENT "Generating ${TARFILE}")
         ENDIF()
 
+        # Install resulting files if generated.
+        INSTALL(CODE "IF (EXISTS ${TGT}/${NEK_BASE}.pdf)
+                FILE(INSTALL ${TGT}/${NEK_BASE}.pdf
+                DESTINATION \${CMAKE_INSTALL_PREFIX}/${NEKTAR_DOC_DIR}/tutorials/${NEK_TARGET})
+             ENDIF()")
+
         ADD_DEPENDENCIES(tutorials-pdf ${NEK_TARGET}-pdf)
     ENDIF ()
 
@@ -133,6 +139,17 @@ MACRO(ADD_NEKTAR_TUTORIAL)
                 COMMENT "Converting ${pdf} to PNG...")
         ENDFOREACH()
 
+        # Store a 'clean' version for installation purposes.
+        ADD_CUSTOM_COMMAND(TARGET ${NEK_TARGET}-html POST_BUILD
+            COMMAND cmake -E copy_directory ${TGT}/html ${TGT}/html-only
+            COMMENT "Making html-only copy without archive")
+
+        # Install resulting files if generated.
+        INSTALL(CODE "IF (EXISTS ${TGT}/html-only)
+                FILE(INSTALL ${TGT}/html-only/
+                DESTINATION \${CMAKE_INSTALL_PREFIX}/${NEKTAR_DOC_DIR}/tutorials/${NEK_TARGET}/html)
+             ENDIF()")
+
         IF (NEK_ARCHIVE)
             SET(TARFILE "${TGT}/html/${NEK_TARGET}.tar.gz")
             ADD_CUSTOM_COMMAND(TARGET ${NEK_TARGET}-html POST_BUILD
@@ -152,6 +169,17 @@ MACRO(ADD_NEKTAR_TUTORIAL)
 
         ADD_DEPENDENCIES(tutorials-html ${NEK_TARGET}-html)
     ENDIF()
+
+    # Install tutorial files.
+    FOREACH(f ${NEK_ARCHIVE})
+        IF (IS_DIRECTORY ${SRC}/${f})
+            INSTALL(DIRECTORY ${SRC}/${f}
+                    DESTINATION ${NEKTAR_DOC_DIR}/tutorials/${NEK_TARGET})
+        ELSEIF (EXISTS ${SRC}/${f})
+            INSTALL(FILES ${SRC}/${f}
+                    DESTINATION ${NEKTAR_DOC_DIR}/tutorials/${NEK_TARGET})
+        ENDIF()
+    ENDFOREACH()
 ENDMACRO()
 
 MACRO(ADD_NEKTAR_TUTORIAL_TEST solver testname)
@@ -173,7 +201,7 @@ MACRO(ADD_NEKPY_TUTORIAL_TEST testname)
 ENDMACRO()
 
 ADD_SUBDIRECTORY(basics)
-ADD_SUBDIRECTORY(events)
+#ADD_SUBDIRECTORY(events)
 ADD_SUBDIRECTORY(fundamentals)
 ADD_SUBDIRECTORY(incns)
 ADD_SUBDIRECTORY(flow-stability)

fundamentals/differentiation/CMakeLists.txt

@@ -4,18 +4,18 @@ ADD_NEKTAR_TUTORIAL(PDF HTML TARGET fundamentals-differentiation
     STYLING_FILE styling.cfg
     ARCHIVE fundamentals-differentiation)
 
-ADD_NEKTAR_EXECUTABLE(
-    StdDifferentiation1D COMPONENT tutorial
-    SOURCES fundamentals-differentiation/completed/StdDifferentiation1D.cpp
-    DEPENDS StdRegions)
-ADD_NEKTAR_EXECUTABLE(
-    StdDifferentiation2D COMPONENT tutorial
-    SOURCES fundamentals-differentiation/completed/StdDifferentiation2D.cpp
-    DEPENDS StdRegions)
-ADD_NEKTAR_EXECUTABLE(
-    LocDifferentiation2D COMPONENT tutorial
-    SOURCES fundamentals-differentiation/completed/LocDifferentiation2D.cpp
-    DEPENDS StdRegions)
+#ADD_NEKTAR_EXECUTABLE(
+#    StdDifferentiation1D COMPONENT tutorial
+#    SOURCES fundamentals-differentiation/completed/StdDifferentiation1D.cpp
+#    DEPENDS StdRegions)
+#ADD_NEKTAR_EXECUTABLE(
+#    StdDifferentiation2D COMPONENT tutorial
+#    SOURCES fundamentals-differentiation/completed/StdDifferentiation2D.cpp
+#    DEPENDS StdRegions)
+#ADD_NEKTAR_EXECUTABLE(
+#    LocDifferentiation2D COMPONENT tutorial
+#    SOURCES fundamentals-differentiation/completed/LocDifferentiation2D.cpp
+#    DEPENDS StdRegions)
 
 # Add tests only if we are building from within the Nektar++ tree
 IF (NEKTAR_BUILD_TESTS)

fundamentals/differentiation/fundamentals-differentiation/completed/LocDifferentiation2D.cpp

@@ -10,7 +10,7 @@ using namespace std;
 
 #define WITHSOLUTION 1
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "=========================================================" << endl;
     cout << "|     DIFFERENTIATION IN 2D ELEMENT in Local Region     |" << endl;

fundamentals/differentiation/fundamentals-differentiation/completed/StdDifferentiation1D.cpp

@@ -10,7 +10,7 @@ using namespace std;
 
 #define WITHSOLUTION 1
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "======================================================" << endl;
     cout << "|      DIFFERENTIATION IN A 1D STANDARD REGION       |" << endl;

fundamentals/differentiation/fundamentals-differentiation/completed/StdDifferentiation2D.cpp

@@ -10,7 +10,7 @@ using namespace std;
 
 #define WITHSOLUTION 1
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "========================================================" << endl;
     cout << "|   DIFFERENTIATION IN 2D ELEMENT in Standard Region   |" << endl;

fundamentals/differentiation/fundamentals-differentiation/tutorial/LocDifferentiation2D.cpp

@@ -8,7 +8,7 @@
 using namespace Nektar;
 using namespace std;
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "=========================================================" << endl;
     cout << "|     DIFFERENTIATION IN 2D ELEMENT in Local Region     |" << endl;

fundamentals/differentiation/fundamentals-differentiation/tutorial/StdDifferentiation1D.cpp

@@ -8,7 +8,7 @@
 using namespace Nektar;
 using namespace std;
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "======================================================" << endl;
     cout << "|      DIFFERENTIATION IN A 1D STANDARD REGION       |" << endl;

fundamentals/differentiation/fundamentals-differentiation/tutorial/StdDifferentiation2D.cpp

@@ -8,7 +8,7 @@
 using namespace Nektar;
 using namespace std;
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "===========================================================" << endl;
     cout << "|    DIFFERENTIATION IN 2D ELEMENT in Standard Region     |" << endl;

fundamentals/integration/CMakeLists.txt

@@ -4,18 +4,20 @@ ADD_NEKTAR_TUTORIAL(PDF HTML TARGET fundamentals-integration
     STYLING_FILE styling.cfg
     ARCHIVE fundamentals-integration)
 
-ADD_NEKTAR_EXECUTABLE(
-    StdIntegration1D COMPONENT tutorial
-    SOURCES fundamentals-integration/completed/StdIntegration1D.cpp
-    DEPENDS StdRegions)
-ADD_NEKTAR_EXECUTABLE(
-    StdIntegration2D COMPONENT tutorial
-    SOURCES fundamentals-integration/completed/StdIntegration2D.cpp
-    DEPENDS StdRegions)
-ADD_NEKTAR_EXECUTABLE(
-    LocIntegration2D COMPONENT tutorial
-    SOURCES fundamentals-integration/completed/LocIntegration2D.cpp
-    DEPENDS StdRegions)
+IF (NEKTAR_BUILD_LIBRARY)
+    ADD_NEKTAR_EXECUTABLE(
+        StdIntegration1D COMPONENT tutorial
+        SOURCES fundamentals-integration/completed/StdIntegration1D.cpp
+        DEPENDS StdRegions)
+    ADD_NEKTAR_EXECUTABLE(
+        StdIntegration2D COMPONENT tutorial
+        SOURCES fundamentals-integration/completed/StdIntegration2D.cpp
+        DEPENDS StdRegions)
+    ADD_NEKTAR_EXECUTABLE(
+        LocIntegration2D COMPONENT tutorial
+        SOURCES fundamentals-integration/completed/LocIntegration2D.cpp
+        DEPENDS StdRegions)
+ENDIF()
 
 # Add tests only if we are building from within the Nektar++ tree
 IF (NEKTAR_BUILD_TESTS)

fundamentals/integration/fundamentals-integration/completed/LocIntegration2D.cpp

@@ -8,7 +8,7 @@ using namespace std;
 
 #define WITHSOLUTION 1
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "==========================================================="<< endl;
     cout << "|      INTEGRATION ON 2D ELEMENT in Local Region          |"<< endl;

fundamentals/integration/fundamentals-integration/completed/StdIntegration1D.cpp

@@ -9,7 +9,7 @@ using namespace std;
 
 #define WITHSOLUTION 1
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "======================================================" <<endl;
     cout << "|        INTEGRATION ON A 1D STANDARD REGION         |" <<endl;

fundamentals/integration/fundamentals-integration/completed/StdIntegration2D.cpp

@@ -8,7 +8,7 @@ using namespace std;
 
 #define WITHSOLUTION 1
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "==========================================================="<< endl;
     cout << "|    INTEGRATION ON 2D ELEMENT in Standard Region         |"<< endl;

fundamentals/integration/fundamentals-integration/tutorial/LocIntegration2D.cpp

@@ -6,7 +6,7 @@
 using namespace Nektar;
 using namespace std;
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "==========================================================="<< endl;
     cout << "|      INTEGRATION ON 2D ELEMENT in Local Region          |"<< endl;

fundamentals/integration/fundamentals-integration/tutorial/StdIntegration1D.cpp

@@ -7,7 +7,7 @@
 using namespace Nektar;
 using namespace std;
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "======================================================" <<endl;
     cout << "|        INTEGRATION ON A 1D STANDARD REGION         |" <<endl;

fundamentals/integration/fundamentals-integration/tutorial/StdIntegration2D.cpp

@@ -6,7 +6,7 @@
 using namespace Nektar;
 using namespace std;
 
-int main(int argc, char *argv[])
+int main(int, char **)
 {
     cout << "==========================================================="<< endl;
     cout << "|    INTEGRATION ON 2D ELEMENT in Standard Region         |"<< endl;

shared/pgfsys-tex4ht.def

@@ -7,8 +7,8 @@
 %
 % See the file doc/generic/pgf/licenses/LICENSE for more details.
 
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.25 2013/08/06 17:46:08 tantau Exp $
-
+%\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsys-tex4ht.def,v 1.25 2013/08/06 17:46:08 tantau Exp $
+\ProvidesFileRCS{pgfsys-tex4ht.def}
 
 
 % Driver commands for tex4ht