Better code understanding: move dm to micmac

To be tested: Better code understanding: move dm to micmac
OpenDroneMap · Sep 17, 2024 · 1330eb1 · 1330eb1
2 parents 9ae2d16 + fe9007f
commit 1330eb1
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -48,8 +48,8 @@ RUN mkdir -p tmp /code
 RUN mkdir -p /code
 
 # Build MicMac
-RUN git clone --depth 1  https://github.com/OpenDroneMap/micmac
-RUN cd micmac && \ 
+RUN git clone --depth 1  https://github.com/OpenDroneMap/micmac micmac-build
+RUN cd micmac-build && \ 
     rm -rf build && mkdir build && cd build && \
     cmake \
     	-DBUILD_POISSON=0 \
@@ -72,14 +72,14 @@ ENV python "$(which python3)"
 RUN figlet -f slant NodeMICMAC
 
 RUN mkdir -p /code/opendm
-COPY dm/opendm /code/opendm
-COPY dm/odm_options.json /code
-COPY dm/settings.yaml /code
-COPY dm/VERSION /code
-COPY dm/run.sh /code
-COPY dm/run.py /code
-
-RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /staging /var/www/micmac
+COPY micmac/opendm /code/opendm
+COPY micmac/odm_options.json /code
+COPY micmac/settings.yaml /code
+COPY micmac/VERSION /code
+COPY micmac/run.sh /code
+COPY micmac/run.py /code
+
+RUN apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /staging /var/www/micmac-build
 
 WORKDIR "/var/www"
 

diff --git a/dm/VERSION b/dm/VERSION
diff --git a/micmac/VERSION b/micmac/VERSION
@@ -0,0 +1 @@
+1.0.beta4
diff --git a/dm/odm_options.json → micmac/odm_options.json b/dm/odm_options.json → micmac/odm_options.json
diff --git a/dm/opendm/__init__.py → micmac/opendm/__init__.py b/dm/opendm/__init__.py → micmac/opendm/__init__.py
diff --git a/dm/opendm/config.py → micmac/opendm/config.py b/dm/opendm/config.py → micmac/opendm/config.py
diff --git a/dm/opendm/context.py → micmac/opendm/context.py b/dm/opendm/context.py → micmac/opendm/context.py
diff --git a/dm/opendm/gcp.py → micmac/opendm/gcp.py b/dm/opendm/gcp.py → micmac/opendm/gcp.py
diff --git a/dm/opendm/io.py → micmac/opendm/io.py b/dm/opendm/io.py → micmac/opendm/io.py
diff --git a/dm/opendm/location.py → micmac/opendm/location.py b/dm/opendm/location.py → micmac/opendm/location.py
diff --git a/dm/opendm/log.py → micmac/opendm/log.py b/dm/opendm/log.py → micmac/opendm/log.py
diff --git a/dm/opendm/progress.py → micmac/opendm/progress.py b/dm/opendm/progress.py → micmac/opendm/progress.py
diff --git a/dm/opendm/system.py → micmac/opendm/system.py b/dm/opendm/system.py → micmac/opendm/system.py
diff --git a/dm/requirements.txt → micmac/requirements.txt b/dm/requirements.txt → micmac/requirements.txt
diff --git a/dm/run.py → micmac/run.py b/dm/run.py → micmac/run.py
diff --git a/dm/run.sh → micmac/run.sh b/dm/run.sh → micmac/run.sh
diff --git a/dm/settings.yaml → micmac/settings.yaml b/dm/settings.yaml → micmac/settings.yaml