Author Topic: ground.outside - duplicate definition  (Read 937 times)

0 Members and 1 Guest are viewing this topic.

Offline Vladki

ground.outside - duplicate definition
« on: July 06, 2016, 10:08:10 PM »
This patch got lost in the thread about experimental server. The object ground.outside is defined in a dat file, and generated on the fly from makefile. As a result pakset compiled on different computers were not consistent. Makefile generation disabled:

Code: [Select]
diff --git a/Makefile b/Makefile
index e88941d..2b5d446 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # to get fresh and ready to deploy .tbz2 and .zip archives
 #
 # Change THIS to change the version string encoded in the pak file
-VERSION_STRING = "pak128.Britain-Ex-0.9.2"
+# VERSION_STRING = "pak128.Britain-Ex-0.9.2"
 #
 #
 #
@@ -157,11 +157,11 @@ $(OUTSIDE):
        @echo "===> OUTSIDE with REVISION and grounds"
        @mkdir -p $(PAKDIR)
        @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null
-       @echo -e "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/outsiderev.dat
-       #@svnversion >>$@/outsiderev.dat
-       @echo -e "Image[0][0]=images/ls-water-outside-128.0.0\n-" >>$@/outsiderev.dat
-       @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
-       @rm $@/outsiderev.dat
+#      @echo -e "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/outsiderev.dat
+#      #@svnversion >>$@/outsiderev.dat
+#      @echo -e "Image[0][0]=images/ls-water-outside-128.0.0\n-" >>$@/outsiderev.dat
+#      @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
+#      @rm $@/outsiderev.dat
 
 clean:
        @echo "===> CLEAN"


Offline jamespetts

  • Simitrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 15688
  • Total likes: 395
  • Helpful: 174
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: ground.outside - duplicate definition
« Reply #1 on: July 07, 2016, 10:05:39 PM »
Thank you for the report. I am having trouble finding more than one of the following:

Code: [Select]
VERSION_STRING = "pak128.Britain-Ex-0.9.2"

May I ask where the other is located?
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Offline Vladki

Re: ground.outside - duplicate definition
« Reply #2 on: July 10, 2016, 07:54:35 PM »
pak1file/128/outside.dat

Offline jamespetts

  • Simitrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 15688
  • Total likes: 395
  • Helpful: 174
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: ground.outside - duplicate definition
« Reply #3 on: July 10, 2016, 10:04:11 PM »
Thank you - now fixed.
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Offline Vladki

Re: ground.outside - duplicate definition
« Reply #4 on: December 03, 2016, 07:01:09 PM »
This patch was not applied completely. Here is the missing part:

Code: [Select]
diff --git a/Makefile b/Makefile
index 5b1fa14..5753835 100644
--- a/Makefile
+++ b/Makefile
@@ -156,12 +156,7 @@ $(DIRS256):
 $(OUTSIDE):
        @echo "===> OUTSIDE with REVISION and grounds"
        @mkdir -p $(PAKDIR)
-       @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null
-       @echo -e "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/outsiderev.dat
-       #@svnversion >>$@/outsiderev.dat
-       @echo -e "Image[0][0]=images/ls-water-outside-128.0.0\n-" >>$@/outsiderev.dat
-       @$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
-       @rm $@/outsiderev.dat
+       @$(MAKEOBJ) quiet PAK128 $(PAKDIR)/ $@/ > /dev/null
 
 clean:
        @echo "===> CLEAN"

I hoped it will help with the desync issue, but it does not...

Offline jamespetts

  • Simitrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 15688
  • Total likes: 395
  • Helpful: 174
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: ground.outside - duplicate definition
« Reply #5 on: December 03, 2016, 07:04:00 PM »
Splendid - thank you for that.
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

Offline Vladki

Re: ground.outside - duplicate definition
« Reply #6 on: December 03, 2016, 08:15:04 PM »
James please, remove the old makeobj-experimental from the pakset repository.

Thanks for the fix, but I think that the line:
 @mkdir -p $(PAKDIR)
 should not  be removed
« Last Edit: December 03, 2016, 08:26:53 PM by Vladki »