fix: stop messing with gdk/sdk copying

Author: Yannick Habecker

docker/base.Dockerfile

@@ -1,5 +1,22 @@
 FROM ubuntu:xenial
 RUN dpkg --add-architecture i386
-RUN apt-get update
-RUN apt-get install -y python3.5-dev:i386
-RUN apt-get install -f
+RUN apt-get update && apt-get install -y python3.5-dev:i386
+RUN apt-get install -f
+
+RUN apt-get update && apt-get install -y build-essential g++ cmake g++-multilib git
+RUN apt-get install -f
+
+# install dependencies
+
+RUN mkdir /root/sampgdk
+
+RUN git clone https://github.com/Zeex/sampgdk.git /root/sampgdk
+RUN git clone https://github.com/Zeex/samp-plugin-sdk.git /root/sampsdk
+
+RUN apt-get update && apt-get install -y python2.7 python-pip
+RUN pip install ply
+
+RUN mkdir /root/sampgdk/build
+RUN cd /root/sampgdk/build && cmake .. -DSAMP_SDK_ROOT=/root/sampsdk -DSAMPGDK_STATIC=ON -DSAMPGDK_BUILD_AMALGAMATION=ON
+RUN cmake --build /root/sampgdk/build --config Release
+RUN cmake --build /root/sampgdk/build --config Release --target install

docker/compile.0.Dockerfile

@@ -1,5 +1,6 @@
-FROM pysamp/compile.0:latest
+FROM pysamp/base:latest
 WORKDIR /usr/src/pysamp
 COPY . .
-RUN [ "cmake", "./src", "-G", "Unix Makefiles", "-DPYTHON_INCLUDE_DIR=/usr/include/python3.5m", "-DPYTHON_LIBRARY=/usr/lib/i386-linux-gnu/libpython3.5m.so", "-DCMAKE_BUILD_TYPE=Debug" ]    
-CMD make; cp ./pySAMP.so /target/
+
+RUN [ "cmake", "./src", "-G", "Unix Makefiles", "-DSAMPSDK_DIR=/root/sampsdk", "-DSAMPGDK_DIR=/root/sampgdk", "-DPYTHON_INCLUDE_DIR=/usr/include/python3.5m", "-DPYTHON_LIBRARY=/usr/lib/i386-linux-gnu/libpython3.5m.so", "-DCMAKE_BUILD_TYPE=Debug" ]    
+CMD make; cp ./PySAMP.so /target/

docker/compile.Dockerfile

@@ -1,4 +1,3 @@
 docker build -f ./base.Dockerfile -t pysamp/base ../
-docker build -f ./compile.0.Dockerfile -t pysamp/compile.0 ../
 docker build -f ./compile.Dockerfile -t pysamp/compile ../
 docker run  -v "$(cd ../ && pwd)"/target:/target --rm pysamp/compile

docker/make

@@ -4,7 +4,7 @@ add_compile_options(-std=c++11)
 
 
 cmake_minimum_required(VERSION 2.8)
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH ${SAMPGDK_DIR}/cmake)
 
 #find_package (Python3 COMPONENTS Interpreter Development)
 
@@ -13,10 +13,13 @@ find_package (PythonLibs 3.5.2)
 
 include(AMXConfig)
 include(AddSAMPPlugin)
+include(FindSAMPSDK)
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/amx
+  ${SAMPSDK_DIR}/amx
+  ${SAMPGDK_DIR}/build/lib/sampgdk/
+  ${SAMPSDK_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/bindings
   ${CMAKE_CURRENT_SOURCE_DIR}/pysamp
   ${PYTHON_INCLUDE_DIR}
@@ -30,13 +33,13 @@ add_definitions(-DSAMPGDK_AMALGAMATION)
 
 link_libraries(${PYTHON_LIBRARIES})
 
-add_samp_plugin(pySAMP
-  amxplugin.cpp
+add_samp_plugin(PySAMP
+  ${SAMPSDK_DIR}/amxplugin.cpp
   main.h
   main.cpp
   main.def
-  sampgdk.c
-  sampgdk.h
+  ${SAMPGDK_DIR}/build/lib/sampgdk/sampgdk.c
+  ${SAMPGDK_DIR}/build/lib/sampgdk/sampgdk.h
   pysamp/pysamp.cpp
   pysamp/pysamp.h
   pysamp/pygamemode.cpp
@@ -49,6 +52,8 @@ add_samp_plugin(pySAMP
   test/callbackstest.cpp
 )
 
+target_link_libraries(PySAMP sampgdk)
+
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)