7 files changed, 17 insertions, 155 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a554e0a..1175530 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,19 @@
+2008-12-29  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/CMakeLists.txt:
+        Removed llkdu from cmake.
+        * linden/indra/cmake/CopyWinLibs.cmake:
+        Ditto.
+        * linden/indra/cmake/LLKDU.cmake:
+        Ditto.
+        * linden/indra/newview/CMakeLists.txt:
+        Ditto.
+        * linden/indra/newview/viewer_manifest.py:
+        Ditto.
+        * linden/install.xml:
+        Ditto.
+
+
 2008-12-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/install.xml:
diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt
index eb06191..09fa753 100644
--- a/linden/indra/CMakeLists.txt
+++ b/linden/indra/CMakeLists.txt
@@ -45,10 +45,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs)
 add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
 add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
 
-if (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE)
-  add_subdirectory(${LIBS_CLOSED_PREFIX}llkdu)
-endif (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE)
-
 add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
 
 if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 345761a..e2c45fd 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -105,51 +105,5 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
-set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
-if(EXISTS ${internal_llkdu_path})
-    set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll")
-    set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst}
-        DEPENDS ${internal_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
-        )
-    set(all_targets ${all_targets} ${llkdu_dst})
-else(EXISTS ${internal_llkdu_path})
-    set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
-    set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${debug_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
-        DEPENDS ${debug_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
-        )
-    set(all_targets ${all_targets} ${debug_llkdu_dst})
 
-    set(release_llkdu_src "${release_src_dir}/llkdu.dll")
-    set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${release_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
-        DEPENDS ${release_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
-        )
-    set(all_targets ${all_targets} ${release_llkdu_dst})
-
-    set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${relwithdebinfo_llkdu_dst}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
-        DEPENDS ${release_llkdu_src}
-        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-        )
-    set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
-   
-endif (EXISTS ${internal_llkdu_path})
-
-add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
-
-if(EXISTS ${internal_llkdu_path})
-    add_dependencies(copy_win_libs llkdu)
-endif(EXISTS ${internal_llkdu_path})
+add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
\ No newline at end of file
diff --git a/linden/indra/cmake/LLKDU.cmake b/linden/indra/cmake/LLKDU.cmake
deleted file mode 100644
index a02b5d9..0000000
--- a/linden/indra/cmake/LLKDU.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
-  use_prebuilt_binary(kdu)
-  if (WINDOWS)
-    set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
-  elseif (LINUX)
-    set(KDU_LIBRARY kdu_v42R)
-  else (WINDOWS)
-    set(KDU_LIBRARY kdu)
-  endif (WINDOWS)
-
-  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-
-  set(LLKDU_LIBRARY llkdu)
-  set(LLKDU_STATIC_LIBRARY llkdu_static)
-  set(LLKDU_LIBRARIES ${LLKDU_LIBRARY})
-  set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY})
-endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index ddf6897..9b7a647 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -31,7 +31,6 @@ include(NDOF)
 include(TemplateCheck)
 include(UI)
 include(UnixInstall)
-include(LLKDU)
 include(ViewerMiscLibs)
 
 if (WINDOWS)
@@ -1272,10 +1271,6 @@ add_executable(imprudence-bin
     )
 check_message_template(imprudence-bin)
 
-if (LLKDU_LIBRARY)
-  add_dependencies(imprudence-bin ${LLKDU_LIBRARY})
-endif (LLKDU_LIBRARY)
-
 set(PACKAGE OFF CACHE BOOL
     "Add a package target that builds an installer package.")
 
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 62c9537..f707d15 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -183,14 +183,6 @@ class WindowsManifest(ViewerManifest):
         # the final exe is complicated because we're not sure where it's coming from,
         # nor do we have a fixed name for the executable
         self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe())
-        # need to get the kdu dll from any of the build directories as well
-        #self.path(self.find_existing_file(
-                # *FIX:Mani we need to add support for packaging specific targets.
-                #'../llkdu/debug/llkdu.dll',
-                #'../llkdu/release/llkdu.dll',
-                #'../llkdu/relwithdebinfo/llkdu.dll',
-                #'../../libraries/i686-win32/lib/release/llkdu.dll'), 
-                #  dst='llkdu.dll')
 
         self.gather_documents()
 
@@ -448,9 +440,6 @@ class DarwinManifest(ViewerManifest):
                 #self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
                 #self.path("vivox-runtime/universal-darwin/SLVoiceAgent.app", "SLVoiceAgent.app")
 
-                # llkdu dynamic library
-#                self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
-                
                 #libfmodwrapper.dylib
                 #self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
                 
@@ -658,7 +647,6 @@ class Linux_i686Manifest(LinuxManifest):
         self.path("app_settings/mozilla-runtime-linux-i686")
 
         if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
-#            self.path("libkdu_v42R.so")
 #            self.path("libfmod-3.75.so")
             self.path("libapr-1.so.0")
             self.path("libaprutil-1.so.0")
@@ -673,7 +661,6 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libopenjpeg.so.2")
             #self.path("libtcmalloc.so.0") - bugged
             #self.path("libstacktrace.so.0") - probably bugged
-#            self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason
             self.end_prefix("lib")
 
             # Vivox runtimes
diff --git a/linden/install.xml b/linden/install.xml
index a6270be..6184335 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -490,72 +490,6 @@
           </map>
         </map>
       </map>
-      <key>kdu</key>
-      <map>
-        <key>copyright</key>
-        <string>on file</string>
-        <key>description</key>
-        <string>Kakadu (KDU) JPEG-2000 decoder library. </string>
-        <key>license</key>
-        <string>kdu</string>
-        <key>packages</key>
-        <map>
-          <key>darwin</key>
-          <map>
-            <key>md5sum</key>
-            <string>9a91ecd80203a24fb347b1436155b013</string>
-            <key>url</key>
-            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-darwin-20080716.tar.bz2</uri>
-          </map>
-          <key>linux</key>
-          <map>
-            <key>md5sum</key>
-            <string>daadd8c268e16f8c5f6145be8596b8b8</string>
-            <key>url</key>
-            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-linux-20080716.tar.bz2</uri>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>15528c24ca657b524d9ab3ccbb33c766</string>
-            <key>url</key>
-            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-windows-20080613.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
-      <key>kdu-binaries</key>
-      <map>
-        <key>copyright</key>
-        <string>see kdu</string>
-        <key>description</key>
-        <string>see kdu</string>
-        <key>license</key>
-        <string>kdu</string>
-        <key>packages</key>
-        <map>
-          <key>darwin</key>
-          <map>
-            <key>md5sum</key>
-            <string>480fbeeb47c9b9c4a2f947e310c9821c</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-darwin-20080617.tar.bz2</uri>
-          </map>
-          <key>linux</key>
-          <map>
-            <key>md5sum</key>
-            <string>ca87644e377a6cf16db4ba6dbd2f8689</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-linux-20080617.tar.bz2</uri>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>87af253b1d76437290355e8e20029377</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-windows-20080617.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
       <key>libmono</key>
       <map>
         <key>copyright</key>